summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2018-01-09 16:01:09 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-09 16:01:09 +0000
commit138e8ad1a211c02c1d7323a79e7ab4c1a983f31f (patch)
treee1fdf5744426907b1753ec93c6f0530bb6b25983 /Gemfile
parent596f270450c743c95237a5342b85bb8df3650395 (diff)
downloadgitlab-ce-138e8ad1a211c02c1d7323a79e7ab4c1a983f31f.tar.gz
Fixing bug related to wiki last version
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 23d0b3d9b3e..4fea1d486ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,6 +70,10 @@ gem 'net-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
gem 'gollum-lib', '~> 4.2', require: false
+
+# Before updating this gem, check if
+# https://github.com/gollum/rugged_adapter/pull/28 has been merged.
+# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection