diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-19 12:34:49 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-04-19 12:34:49 +0300 |
commit | 2c7c8db6a52fb324d72ce14c1c77212826a86b6a (patch) | |
tree | 54a281e21e4884252fb02be429d57a63e8c85331 | |
parent | 00167a2b1a2e47afd2cfa9747fbb4889b68d2ebb (diff) | |
parent | 409ba61a59483ef214dc742bbe73f47d6a77bd24 (diff) |
Merge branch 'fj-upgrade-gitlab-gollum-lib-to-4.2.7.2' into 'master'
Upgrading gitlab-gollum-lib and rouge
See merge request gitlab-org/gitlab-ce!18436
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -140,7 +140,7 @@ gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.6' gem 'asciidoctor-plantuml', '0.0.8' -gem 'rouge', '~> 2.0' +gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' gem 'nokogiri', '~> 1.8.2' diff --git a/Gemfile.lock b/Gemfile.lock index d6ea73da805..745732f3537 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,12 +303,12 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-gollum-lib (4.2.7.1) + gitlab-gollum-lib (4.2.7.2) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (>= 1.6.1, < 2.0) - rouge (~> 2.1) + rouge (~> 3.1) sanitize (~> 2.1) stringex (~> 2.6) gitlab-gollum-rugged_adapter (0.4.4) @@ -747,7 +747,7 @@ GEM retriable (3.1.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.2.1) + rouge (3.1.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1160,7 +1160,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 2.0) + rouge (~> 3.1) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.6.0) |