diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-22 00:44:31 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-10-12 19:10:00 +0300 |
| commit | 0190b014508c30cad86e55663010ba63f64c1016 (patch) | |
| tree | 2da18adafbceb2932502364a8fa3381320becbac | |
| parent | 5e4bf3d8de3102fcad7ec949b50909b98d5fc0e6 (diff) | |
Merge branch 'winh-upgrade-nokogiri' into 'master'
Upgrade Nokogiri because of CVE-2017-9050
See merge request gitlab-org/gitlab-ce!14427
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -124,7 +124,7 @@ gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.0' +gem 'nokogiri', '~> 1.8.1' # Diffs gem 'diffy', '~> 3.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 3c6f01c95ba..09425cd8e63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,7 +460,7 @@ GEM method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.2.0) + mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) @@ -475,8 +475,8 @@ GEM net-ldap (0.16.0) net-ssh (3.0.1) netrc (0.11.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) numerizer (0.1.1) oauth (0.5.1) oauth2 (1.4.0) @@ -1017,7 +1017,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) net-ldap net-ssh (~> 3.0.1) - nokogiri (~> 1.8.0) + nokogiri (~> 1.8.1) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) |