diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-21 21:44:31 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-28 12:01:01 -0500 |
| commit | 7d4ad67b8fa0124680eebb20f39f0eb06c524e58 (patch) | |
| tree | ada5bf70c8ac03597ca49983a290f1ce6223a96a | |
| parent | bc8a5795b73b55619e3ef6f6b2420a28af478ff1 (diff) | |
| download | gitlab-ce-7d4ad67b8fa0124680eebb20f39f0eb06c524e58.tar.gz | |
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 | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -128,7 +128,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 554d72a2512..2809729698f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -483,7 +483,8 @@ GEM method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.2.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) @@ -497,8 +498,8 @@ GEM net-ldap (0.16.0) net-ssh (4.1.0) 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) @@ -1066,7 +1067,7 @@ DEPENDENCIES mysql2 (~> 0.4.5) net-ldap net-ssh (~> 4.1.0) - nokogiri (~> 1.8.0) + nokogiri (~> 1.8.1) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) |