diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-01-09 19:02:39 +0300 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-10 03:21:11 +0300 |
commit | 49f80ecaab425a28b7a87c94f7b1e193890e6a8a (patch) | |
tree | 5f9022fffab96687ef086a11802e875a0520b675 /Gemfile | |
parent | ea5ab9fe87999fcfb03fc8c5341a5ad3b6c334b9 (diff) |
Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'
Fixing bug related to wiki last version
Closes #41477 and #41506
See merge request gitlab-org/gitlab-ce!16197
(cherry picked from commit 65b04860c24949f8c327db0be9fc967dfe8225b5)
e44ca26f Fixing bug related to wiki last version
abe399b1 Added changelog
e471ec00 Restoring last version and created monkey patch
52c9dcb4 Fixed spec descriptions
5814d83c Updated monkey patch to work with paths with more than one dir
b9ff53c0 Updated specs
bc261232 Fixing offense
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |