summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-28 00:37:17 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-28 00:37:17 +0500
commite92669fb2d60e4bb331e67d9bfd17a5266152a65 (patch)
tree2fa67203b08b6b0837d8cef45c8bf089e06034a2
parent89fa800e28e4b740b9de2e526f0f4354d8310ecb (diff)
downloadgitlab-ce-e92669fb2d60e4bb331e67d9bfd17a5266152a65.tar.gz
install rdiscount
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock2
2 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 60fc118c609..fc040ce08c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ gem "pygments.rb", "0.2.3"
gem "thin"
gem "git"
gem "acts_as_list"
+gem 'rdiscount'
group :assets do
gem 'sass-rails', " ~> 3.1.0"
@@ -26,7 +27,7 @@ group :assets do
gem 'uglifier'
end
-group :development do
+group :development do
gem 'rails-footnotes', '>= 3.7.5.rc4'
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 83ccebd89b0..83df35b52af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -161,6 +161,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
+ rdiscount (1.6.8)
rdoc (3.9.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -264,6 +265,7 @@ DEPENDENCIES
pygments.rb (= 0.2.3)
rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4)
+ rdiscount
rspec-rails
ruby-debug19
sass-rails (~> 3.1.0)