summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-12-08 14:53:05 +0000
committerValery Sizov <valery@gitlab.com>2015-12-08 14:53:05 +0000
commit792f2bbe0b306bda266dfc817edf33b4c9e36a0f (patch)
tree962c8bc01efe1efd52dcd1b0e16cc479b601b87b /Gemfile.lock
parent51ed5225adf4aac3ccbf715f8647258dac784abb (diff)
parentf36fe92fcbda02ec130889cc508cab5812fd2b20 (diff)
downloadgitlab-ce-792f2bbe0b306bda266dfc817edf33b4c9e36a0f.tar.gz
Merge branch 'bump-gollum-version' into 'master'
Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge Closes #3767 See merge request !2017
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ce1d1fd3d17..3979418ed45 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,11 +329,11 @@ GEM
activesupport (>= 4.1.0)
gollum-grit_adapter (1.0.0)
gitlab-grit (~> 2.7, >= 2.7.1)
- gollum-lib (4.0.3)
+ gollum-lib (4.1.0)
github-markup (~> 1.3.3)
gollum-grit_adapter (~> 1.0)
nokogiri (~> 1.6.4)
- rouge (~> 1.10.1)
+ rouge (~> 1.9)
sanitize (~> 2.1.0)
stringex (~> 2.5.1)
gon (6.0.1)
@@ -884,7 +884,7 @@ DEPENDENCIES
gitlab_git (~> 7.2.20)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
- gollum-lib (~> 4.0.2)
+ gollum-lib (~> 4.1.0)
gon (~> 6.0.1)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)