summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2018-04-13 13:17:52 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-13 13:17:52 +0000
commitef48664047881411ea849e02c5a675c06275b868 (patch)
tree0047ab15dc175ff808d6c474e7d8ae0c000c2842 /Gemfile
parent9ab4408bfa82602c54673a6fc1691d201a29c7cf (diff)
downloadgitlab-ce-ef48664047881411ea849e02c5a675c06275b868.tar.gz
Replacing gollum libs for custom gitlab ones
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile13
1 files changed, 3 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index 647138cd90f..a8cc34125f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,16 +82,9 @@ 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
-# 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
+gem 'gitlab-gollum-lib', '~> 4.2'
+
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
gem 'github-linguist', '~> 5.3.3', require: 'linguist'