summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2018-02-05 17:17:21 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-02-05 17:17:21 +0000
commit27c08a16891193227fc83bf4692b4d31a3b2539f (patch)
treeecf87006574bee3e9ede3cd3ac9b3ac4bda6f427 /Gemfile
parent0a30a9ea595530499e2d3ae8062506b0a94eebad (diff)
downloadgitlab-ce-27c08a16891193227fc83bf4692b4d31a3b2539f.tar.gz
Allow moving wiki pages from the UI
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index c8e7a970769..52ced4a132b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,6 +69,10 @@ gem 'net-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
+# Before updating this gem, check if
+# https://github.com/gollum/gollum-lib/pull/292 has been merged.
+# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer
+# in config/initializers/gollum.rb
gem 'gollum-lib', '~> 4.2', require: false
# Before updating this gem, check if