summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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.lock
parent37707ac59e6c4e6db2b758338e13cb089dacd8c7 (diff)
downloadgitlab-ce-8acad49fe0a492c2f4e16756135679b3a190543b.tar.gz
Support Wiki with UTF-8 page name
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f4f5649eb75..669bfcf4d6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -381,6 +381,9 @@ GEM
rouge (~> 1.9)
sanitize (~> 2.1.0)
stringex (~> 2.5.1)
+ gollum-rugged_adapter (0.4.2)
+ mime-types (>= 1.15)
+ rugged (~> 0.24.0, >= 0.21.3)
gon (6.0.1)
actionpack (>= 3.0)
json
@@ -703,7 +706,7 @@ GEM
rubyntlm (0.5.2)
rubypants (0.2.0)
rufus-scheduler (3.1.10)
- rugged (0.24.0b13)
+ rugged (0.24.0)
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
@@ -941,6 +944,7 @@ DEPENDENCIES
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.1.0)
+ gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.0.1)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)