diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-08 04:43:17 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-08 04:43:17 -0800 |
| commit | f36fe92fcbda02ec130889cc508cab5812fd2b20 (patch) | |
| tree | 7c0bae18b78e8522000a24ea0bc354f46ef7ef16 /Gemfile.lock | |
| parent | 7f90c8efcc0c8d63fadd293419be679a25e43c95 (diff) | |
| download | gitlab-ce-f36fe92fcbda02ec130889cc508cab5812fd2b20.tar.gz | |
Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge
Closes #3767
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5d70788d981..d8858bd1f09 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) |