Commit ceabda74 authored by Robert Schilling's avatar Robert Schilling

Improve markup gems

parent cb0d63b9
...@@ -79,16 +79,20 @@ gem "six" ...@@ -79,16 +79,20 @@ gem "six"
gem "seed-fu" gem "seed-fu"
# Markdown to HTML # Markdown to HTML
gem "redcarpet", "~> 2.2.2"
gem "github-markup" gem "github-markup"
gem "org-ruby" # For rendering .org files
# Required markup gems by github-markdown
gem 'redcarpet', '~> 2.2.2'
gem 'RedCloth'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '= 0.9.1'
gem 'creole', '~>0.3.6'
gem 'wikicloth', '=0.8.1'
gem 'asciidoctor', '= 0.1.4'
# Diffs # Diffs
gem 'diffy', '~> 3.0.3' gem 'diffy', '~> 3.0.3'
# Asciidoc to HTML
gem "asciidoctor"
# Application server # Application server
group :unicorn do group :unicorn do
gem "unicorn", '~> 4.6.3' gem "unicorn", '~> 4.6.3'
......
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
RedCloth (4.2.9)
ace-rails-ap (2.0.1) ace-rails-ap (2.0.1)
actionmailer (4.1.1) actionmailer (4.1.1)
actionpack (= 4.1.1) actionpack (= 4.1.1)
...@@ -86,6 +87,7 @@ GEM ...@@ -86,6 +87,7 @@ GEM
thor thor
crack (0.4.1) crack (0.4.1)
safe_yaml (~> 0.9.0) safe_yaml (~> 0.9.0)
creole (0.3.8)
d3_rails (3.1.10) d3_rails (3.1.10)
railties (>= 3.1.0) railties (>= 3.1.0)
daemons (1.1.9) daemons (1.1.9)
...@@ -121,6 +123,7 @@ GEM ...@@ -121,6 +123,7 @@ GEM
eventmachine (1.0.3) eventmachine (1.0.3)
excon (0.32.1) excon (0.32.1)
execjs (2.0.2) execjs (2.0.2)
expression_parser (0.9.0)
factory_girl (4.3.0) factory_girl (4.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.3.0) factory_girl_rails (4.3.0)
...@@ -320,7 +323,7 @@ GEM ...@@ -320,7 +323,7 @@ GEM
omniauth-twitter (1.0.1) omniauth-twitter (1.0.1)
multi_json (~> 1.3) multi_json (~> 1.3)
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
org-ruby (0.9.6) org-ruby (0.9.1)
rubypants (>= 0.2.0) rubypants (>= 0.2.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.15.1) pg (0.15.1)
...@@ -413,6 +416,7 @@ GEM ...@@ -413,6 +416,7 @@ GEM
require_all (1.3.2) require_all (1.3.2)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rinku (1.7.3)
rouge (1.3.3) rouge (1.3.3)
rspec (2.14.1) rspec (2.14.1)
rspec-core (~> 2.14.0) rspec-core (~> 2.14.0)
...@@ -563,6 +567,10 @@ GEM ...@@ -563,6 +567,10 @@ GEM
addressable (>= 2.2.7) addressable (>= 2.2.7)
crack (>= 0.3.2) crack (>= 0.3.2)
websocket-driver (0.3.3) websocket-driver (0.3.3)
wikicloth (0.8.1)
builder
expression_parser
rinku
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
...@@ -570,10 +578,11 @@ PLATFORMS ...@@ -570,10 +578,11 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
RedCloth
ace-rails-ap ace-rails-ap
acts-as-taggable-on acts-as-taggable-on
annotate (~> 2.6.0.beta2) annotate (~> 2.6.0.beta2)
asciidoctor asciidoctor (= 0.1.4)
awesome_print awesome_print
better_errors better_errors
binding_of_caller binding_of_caller
...@@ -583,6 +592,7 @@ DEPENDENCIES ...@@ -583,6 +592,7 @@ DEPENDENCIES
coffee-rails coffee-rails
colored colored
coveralls coveralls
creole (~> 0.3.6)
d3_rails (~> 3.1.4) d3_rails (~> 3.1.4)
database_cleaner database_cleaner
default_value_for (~> 3.0.0) default_value_for (~> 3.0.0)
...@@ -632,7 +642,7 @@ DEPENDENCIES ...@@ -632,7 +642,7 @@ DEPENDENCIES
omniauth-github omniauth-github
omniauth-google-oauth2 omniauth-google-oauth2
omniauth-twitter omniauth-twitter
org-ruby org-ruby (= 0.9.1)
pg pg
poltergeist (~> 1.5.1) poltergeist (~> 1.5.1)
pry pry
...@@ -646,6 +656,7 @@ DEPENDENCIES ...@@ -646,6 +656,7 @@ DEPENDENCIES
raphael-rails (~> 2.1.2) raphael-rails (~> 2.1.2)
rb-fsevent rb-fsevent
rb-inotify rb-inotify
rdoc (~> 3.6)
redcarpet (~> 2.2.2) redcarpet (~> 2.2.2)
redis-rails redis-rails
request_store request_store
...@@ -682,3 +693,4 @@ DEPENDENCIES ...@@ -682,3 +693,4 @@ DEPENDENCIES
unicorn-worker-killer unicorn-worker-killer
version_sorter version_sorter
webmock webmock
wikicloth (= 0.8.1)
...@@ -44,8 +44,8 @@ module TreeHelper ...@@ -44,8 +44,8 @@ module TreeHelper
# #
# Returns boolean # Returns boolean
def markup?(filename) def markup?(filename)
filename.downcase.end_with?(*%w(.textile .rdoc .org .creole filename.downcase.end_with?(*%w(.textile .rdoc .org .creole .wiki .mediawiki
.mediawiki .rst .adoc .asciidoc .pod)) .rst .adoc .asciidoc .asc))
end end
def gitlab_markdown?(filename) def gitlab_markdown?(filename)
......
...@@ -2,7 +2,8 @@ require 'spec_helper' ...@@ -2,7 +2,8 @@ require 'spec_helper'
describe TreeHelper do describe TreeHelper do
describe '#markup?' do describe '#markup?' do
%w(textile rdoc org creole mediawiki rst asciidoc pod).each do |type| %w(textile rdoc org creole wiki mediawiki
rst adoc asciidoc asc).each do |type|
it "returns true for #{type} files" do it "returns true for #{type} files" do
markup?("README.#{type}").should be_true markup?("README.#{type}").should be_true
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment