diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-01-30 19:00:47 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-07 14:18:36 -0800 |
| commit | 2e75ed127fe8a960b96e4c17a132924e320676dd (patch) | |
| tree | 2bc099ac646c5937f351dfc59b258322599232df | |
| parent | 94bb13bf583ee6b7ae859afdea9ed7f021161c23 (diff) | |
| download | gitlab-ce-10-2-stable.tar.gz | |
Merge branch '42591-update-nokogiri' into 'master'10-2-stable
Resolve "Update Nokogiri to 1.8.2"
Closes #42591
See merge request gitlab-org/gitlab-ce!16807
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/42591-update-nokogiri.yml | 5 |
3 files changed, 8 insertions, 3 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.1' +gem 'nokogiri', '~> 1.8.2' # Diffs gem 'diffy', '~> 3.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1998897f966..616df4d458e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -495,7 +495,7 @@ GEM net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) oauth (0.5.1) @@ -1067,7 +1067,7 @@ DEPENDENCIES mysql2 (~> 0.4.5) net-ldap net-ssh (~> 4.1.0) - nokogiri (~> 1.8.1) + nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) diff --git a/changelogs/unreleased/42591-update-nokogiri.yml b/changelogs/unreleased/42591-update-nokogiri.yml new file mode 100644 index 00000000000..5f9587d2d92 --- /dev/null +++ b/changelogs/unreleased/42591-update-nokogiri.yml @@ -0,0 +1,5 @@ +--- +title: Update nokogiri to 1.8.2 +merge_request: 16807 +author: +type: security |