diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-09-21 22:27:39 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-09-21 22:32:51 +0200 |
| commit | f45f7ad62a952f90430f67b36c5edc8525f346c6 (patch) | |
| tree | cfe2027aaca53f300aa43d84d720bb8607e7a9aa | |
| parent | 905d24fbdf943ea5ff5ddb3163b8162fad7a4e78 (diff) | |
| download | gitlab-ce-f45f7ad62a952f90430f67b36c5edc8525f346c6.tar.gz | |
Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiri
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 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 a19d681b6c6..4b2f86fe48d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -482,7 +482,7 @@ GEM mime-types (2.99.3) mimemagic (0.3.0) mini_mime (0.1.4) - mini_portile2 (2.2.0) + mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) @@ -496,8 +496,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) @@ -1068,7 +1068,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) |