diff options
author | James Lopez <james@jameslopez.es> | 2018-03-06 14:35:33 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-03-06 14:35:33 +0100 |
commit | b825ba005e9be92c3e55ef68cdb3894732765f14 (patch) | |
tree | 2ceaef31f6f382d6acb2909ae35efb5d7ce17b45 | |
parent | 042718ca29ef8a30738cdbf87372b329cbdf749b (diff) | |
parent | c090ad326505a3ac7b31122c89ecf5492d7a8e37 (diff) | |
download | gitlab-ce-b825ba005e9be92c3e55ef68cdb3894732765f14.tar.gz |
Merge branch '10-3-stable' of gitlab.com:gitlab-org/gitlab-ce into dev-10-3-stable
-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
@@ -132,7 +132,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 f2a64d07f86..f34a3d4fa27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -497,7 +497,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) @@ -1075,7 +1075,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 |