summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAlex Denisov <1101.debian@gmail.com>2012-09-10 09:19:15 +0300
committerAlex Denisov <1101.debian@gmail.com>2012-09-10 09:19:15 +0300
commit77bfc591bf5836892be26059d92411f9fbf04be9 (patch)
tree27b334a35a3ed82cf1f99dec237364718cdde878 /Gemfile
parent85db51f660c4d861c9adf97ed114d4bd4d14ff7d (diff)
parentb565f33472d960e37ed41a8a0c09fbbc3ea65f1e (diff)
downloadgitlab-ce-77bfc591bf5836892be26059d92411f9fbf04be9.tar.gz
Merge 'master' branch
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 5105e550c49..20302954b5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,8 @@ gem "ffaker"
gem "seed-fu"
# Markdown to HTML
-gem "redcarpet", "~> 2.1.1"
+gem "redcarpet", "~> 2.1.1"
+gem "github-markup", "~> 0.7.4"
# Servers
gem "thin"