diff --git a/Gemfile b/Gemfile index 325301b..19612ae 100644 --- a/Gemfile +++ b/Gemfile @@ -66,6 +66,6 @@ gem 'paperclip' ,'~>3.4.0' gem 'git' gem 'haml' -gem 'RedCloth' -gem 'gollum' +#gem 'RedCloth' +#gem 'gollum' gem 'awesome_nested_set' diff --git a/Gemfile.lock b/Gemfile.lock index 5ea29a1..41200a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.7) actionmailer (3.2.9) actionpack (= 3.2.9) mail (~> 2.4.4) @@ -51,7 +50,6 @@ GEM orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.2.1) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -61,27 +59,10 @@ GEM formtastic (~> 2.2) formtastic-bootstrap git (1.2.5) - github-markdown (0.5.3) - github-markup (0.7.5) globalize3 (0.3.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) paper_trail (~> 2) - gollum (2.4.11) - github-markdown (~> 0.5.3) - github-markup (>= 0.7.4, < 1.0.0) - grit (~> 2.5.0) - mustache (>= 0.99.4, < 1.0.0) - nokogiri (~> 1.5.5) - pygments.rb (~> 0.3.2) - sanitize (~> 2.0.3) - sinatra (~> 1.3.3) - stringex (~> 1.5.1) - useragent (~> 0.4.15) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) haml (4.0.0) tilt hike (1.2.1) @@ -98,9 +79,6 @@ GEM treetop (~> 1.4.8) mime-types (1.21) multi_json (1.5.1) - mustache (0.99.4) - nokogiri (1.5.6) - nokogiri (1.5.6-x86-mingw32) orm_adapter (0.4.0) paper_trail (2.7.0) activerecord (~> 3.0) @@ -112,15 +90,9 @@ GEM cocaine (~> 0.4.0) mime-types polyglot (0.3.3) - posix-spawn (0.3.6) - pygments.rb (0.3.7) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-protection (1.4.0) - rack rack-ssl (1.3.3) rack rack-test (0.6.2) @@ -145,17 +117,11 @@ GEM json (~> 1.4) ref (1.0.2) rolify (3.2.0) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sinatra (1.3.5) - rack (~> 1.4) - rack-protection (~> 1.3) - tilt (~> 1.3, >= 1.3.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -163,7 +129,6 @@ GEM tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) sqlite3 (1.3.7-x86-mingw32) - stringex (1.5.1) therubyracer (0.11.3) libv8 (~> 3.11.8.12) ref @@ -178,18 +143,14 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - useragent (0.4.16) warden (1.2.1) rack (>= 1.0) - yajl-ruby (1.1.0) - yajl-ruby (1.1.0-x86-mingw32) PLATFORMS ruby x86-mingw32 DEPENDENCIES - RedCloth awesome_nested_set bootstrap-sass (~> 2.2.0) cancan @@ -200,7 +161,6 @@ DEPENDENCIES formtastic-bootstrap git globalize3 (~> 0.3.0) - gollum haml jquery-rails paper_trail (>= 2.7.0)