Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge
Closes #3767
This commit is contained in:
parent
7f90c8efcc
commit
f36fe92fcb
3 changed files with 5 additions and 4 deletions
|
@ -1,6 +1,7 @@
|
|||
Please view this file on the master branch, on stable branches it's out of date.
|
||||
|
||||
v 8.3.0 (unreleased)
|
||||
- Bump gollum-lib to 4.1.0 (Stan Hu)
|
||||
- Fix API setting of 'public' attribute to false will make a project private (Stan Hu)
|
||||
- Handle and report SSL errors in Web hook test (Stan Hu)
|
||||
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -52,7 +52,7 @@ gem "gitlab_git", '~> 7.2.20'
|
|||
gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
|
||||
|
||||
# Git Wiki
|
||||
gem 'gollum-lib', '~> 4.0.2'
|
||||
gem 'gollum-lib', '~> 4.1.0'
|
||||
|
||||
# Language detection
|
||||
gem "github-linguist", "~> 4.7.0", require: "linguist"
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue