summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorHiroyuki Sato <sathiroyuki@gmail.com>2016-02-28 21:11:43 +0900
committerHiroyuki Sato <sathiroyuki@gmail.com>2016-03-16 02:17:07 +0900
commit8acad49fe0a492c2f4e16756135679b3a190543b (patch)
tree34971a3f5b8a3c7356a27ff8687fe65f64de37e2 /Gemfile
parent37707ac59e6c4e6db2b758338e13cb089dacd8c7 (diff)
downloadgitlab-ce-8acad49fe0a492c2f4e16756135679b3a190543b.tar.gz
Support Wiki with UTF-8 page name
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index a0e8e796627..a849d7493a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,9 @@ gem "gitlab_git", '~> 9.0'
gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
# Git Wiki
-gem 'gollum-lib', '~> 4.1.0'
+# Required manually in config/initializers/gollum.rb to control load order
+gem 'gollum-lib', '~> 4.1.0', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
# Language detection
gem "github-linguist", "~> 4.7.0", require: "linguist"