aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2012-04-11 15:01:18 +0200
committerAlban Peignier2012-04-11 15:01:18 +0200
commit3c45396308bd187e22d0e78ddad48bb8e588a535 (patch)
tree3528695d62dbebb46895ca563b478b22dcebe29c
parent5e0993882c5803697429396bca355d9d5fef62b2 (diff)
downloadchouette-core-3c45396308bd187e22d0e78ddad48bb8e588a535.tar.bz2
Disable jekyll
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock20
2 files changed, 1 insertions, 25 deletions
diff --git a/Gemfile b/Gemfile
index 2a6bfe90f..5c2b7c20f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,6 +54,7 @@ gem 'inherited_resources'
gem 'will_paginate', '~> 3.0'
gem 'ransack'
gem 'squeel'
+gem 'RedCloth'
gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe'
@@ -64,11 +65,6 @@ group :development do
gem 'capistrano-ext'
gem 'guard'
gem 'guard-rspec'
- gem 'RedCloth'
-end
-
-group :jekyll do
- gem 'jekyll'
end
group :test, :development, :cucumber do
diff --git a/Gemfile.lock b/Gemfile.lock
index 51851270e..c4d546fa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,8 +92,6 @@ GEM
activesupport (3.1.3)
multi_json (~> 1.0)
addressable (2.2.6)
- albino (1.3.3)
- posix-spawn (>= 0.3.6)
arel (2.2.3)
autotest-notification (2.3.4)
autotest-standalone (~> 4.5)
@@ -119,8 +117,6 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.0)
ffi (~> 1.0.6)
- classifier (1.3.3)
- fast-stemmer (>= 1.0.0)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
@@ -142,7 +138,6 @@ GEM
nokogiri (>= 1.5.0)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
- directory_watcher (1.4.1)
erubis (2.7.0)
execjs (1.2.13)
multi_json (~> 1.0)
@@ -151,7 +146,6 @@ GEM
factory_girl_rails (1.6.0)
factory_girl (~> 2.5.0)
railties (>= 3.0.0)
- fast-stemmer (1.0.0)
ffi (1.0.11)
ffi (1.0.11-java)
formtastic (2.0.2)
@@ -176,13 +170,6 @@ GEM
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
- jekyll (0.11.2)
- albino (~> 1.3)
- classifier (~> 1.3)
- directory_watcher (~> 1.1)
- kramdown (~> 0.13)
- liquid (~> 2.3)
- maruku (~> 0.5)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
@@ -192,21 +179,17 @@ GEM
jruby-rack (1.1.2)
json (1.6.5)
json (1.6.5-java)
- kramdown (0.13.5)
launchy (2.0.5)
addressable (~> 2.2.6)
launchy (2.0.5-java)
addressable (~> 2.2.6)
ffi (~> 1.0.9)
spoon (~> 0.0.1)
- liquid (2.3.0)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
map_layers (0.0.5)
- maruku (0.6.0)
- syntax (>= 1.0.0)
mime-types (1.18)
multi_json (1.0.4)
net-scp (1.0.4)
@@ -222,7 +205,6 @@ GEM
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- posix-spawn (0.3.6)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
@@ -302,7 +284,6 @@ GEM
activerecord (~> 3.0)
activesupport (~> 3.0)
polyamorous (~> 0.5.0)
- syntax (1.0.0)
term-ansicolor (1.0.7)
therubyrhino (1.73.1)
thor (0.14.6)
@@ -350,7 +331,6 @@ DEPENDENCIES
guard
guard-rspec
inherited_resources
- jekyll
jquery-rails
jruby-openssl
json