diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-04-23 05:32:40 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-04-23 05:32:40 +0000 |
| commit | dfb2c3784e06684e3d76b0f9b30906ef086b938a (patch) | |
| tree | cbbda87fe133693c734ccfa464410e36761d9572 | |
| parent | 47984a873a527cfce6a9a44462d09bbe896e6334 (diff) | |
| parent | 9d7bb9d8c2631a9bd781fa7793fbcfc4fdbf71b8 (diff) | |
| download | gitlab-ce-dfb2c3784e06684e3d76b0f9b30906ef086b938a.tar.gz | |
Merge branch 'sh-bump-nokogiri-1.10.3' into 'master'
Bump Nokogiri to 1.10.3
See merge request gitlab-org/gitlab-ce!27560
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -129,7 +129,7 @@ gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.1' +gem 'nokogiri', '~> 1.10.3' gem 'escape_utils', '~> 1.1' # Calendar rendering diff --git a/Gemfile.lock b/Gemfile.lock index ba4418cd8b3..d214892eed7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -494,7 +494,7 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -1104,7 +1104,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.10.1) + nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) diff --git a/qa/Gemfile b/qa/Gemfile index 38e95ba2d65..64215b24cf1 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -7,6 +7,6 @@ gem 'rake', '~> 12.3.0' gem 'rspec', '~> 3.7' gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.2.13' -gem 'nokogiri', '~> 1.10.1' +gem 'nokogiri', '~> 1.10.3' gem 'rspec-retry', '~> 0.6.1' gem 'faker', '~> 1.6', '>= 1.6.6' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 9d3d42fb6ae..a06c88b6f0a 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -49,7 +49,7 @@ GEM mini_portile2 (2.4.0) minitest (5.11.1) netrc (0.11.0) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) pry (0.11.3) coderay (~> 1.1.0) @@ -102,7 +102,7 @@ DEPENDENCIES capybara (~> 2.16.1) capybara-screenshot (~> 1.0.18) faker (~> 1.6, >= 1.6.6) - nokogiri (~> 1.10.1) + nokogiri (~> 1.10.3) pry-byebug (~> 3.5.1) rake (~> 12.3.0) rspec (~> 3.7) |