summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-11 11:03:57 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-11 11:03:57 +0300
commit630c547dbdfd688da4efced9428779f228242ef2 (patch)
tree9ef660f1670c7342982cb823013ec95023d52880 /Gemfile
parent1743cbf1d8f7fde1595c6b95a417f8a5e2f4d62c (diff)
downloadgitlab-ce-630c547dbdfd688da4efced9428779f228242ef2.tar.gz
Updated gems. Replaced gollum with gollum-lib
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index c63706b346e..71ac795772a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,16 +91,11 @@ gem "colored"
# GitLab settings
gem 'settingslogic'
-# Wiki
-# - Use latest master to resolve Gem dependency with Pygemnts
-# github-linquist needs pygments 0.4.2 but Gollum 2.4.11
-# requires pygments 0.3.2. The latest master Gollum has been updated
-# to use pygments 0.4.2. Change this after next Gollum release.
-gem "gollum", "~> 2.4.0", git: "https://github.com/gollum/gollum.git", ref: "5dcd3c8c8f"
+# Git Wiki
+gem "gollum-lib", "~> 1.0.0"
# Misc
gem "foreman"
-gem "git"
# Cache
gem "redis-rails"