diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-23 07:23:19 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-23 07:25:00 +0300 |
| commit | 3994ea6bcb50840a201d33461888a48380d1142b (patch) | |
| tree | 3b72fafc30e00fb5ad531ac7b23a45888e37daed | |
| parent | 51350d20b17c1045dbd4c749b018c481f7662d3c (diff) | |
Update to gitlab-gollum-lib v4.2.7.5 and make Gemfile consistent with GitLab versions
| -rw-r--r-- | changelogs/unreleased/sh-update-gollum-libs.yml | 6 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-update-gollum-libs.yml b/changelogs/unreleased/sh-update-gollum-libs.yml new file mode 100644 index 000000000..d11b5a45a --- /dev/null +++ b/changelogs/unreleased/sh-update-gollum-libs.yml @@ -0,0 +1,6 @@ +--- +title: Update to gitlab-gollum-lib v4.2.7.5 and make Gemfile consistent with GitLab + versions +merge_request: 828 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index ee7caf8d1..bdfa51ab7 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -11,6 +11,7 @@ GEM ast (2.3.0) charlock_holmes (0.7.6) concurrent-ruby (1.0.5) + crass (1.0.4) diff-lcs (1.3) escape_utils (1.2.1) faraday (0.12.2) @@ -26,13 +27,13 @@ GEM mime-types (>= 1.19) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.4) + gitlab-gollum-lib (4.2.7.5) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (>= 1.6.1, < 2.0) rouge (~> 3.1) - sanitize (~> 2.1) + sanitize (~> 4.6.4) stringex (~> 2.6) gitlab-gollum-rugged_adapter (0.4.4.1) mime-types (>= 1.15) @@ -81,8 +82,10 @@ GEM minitest (5.9.1) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.2) + nokogiri (1.8.3) mini_portile2 (~> 2.3.0) + nokogumbo (1.5.0) + nokogiri os (0.9.6) parallel (1.12.0) parser (2.4.0.0) @@ -121,8 +124,10 @@ GEM rubocop (>= 0.50.0) ruby-progressbar (1.8.3) rugged (0.27.2) - sanitize (2.1.0) + sanitize (4.6.5) + crass (~> 1.0.2) nokogiri (>= 1.4.4) + nokogumbo (~> 1.4) sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) signet (0.8.1) |