diff options
| author | Marin Jankovski <marin@gitlab.com> | 2020-04-30 11:24:01 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2020-04-30 11:24:01 +0300 |
| commit | 8283c5e0daeefef7dc872fee8402cca5a3cbc4cc (patch) | |
| tree | 580c5ebbd720d760cde63f0fa8260ae62aed69ff | |
| parent | 35c8cc1579691334d23f2eacdfa6d61e4992526f (diff) | |
Merge branch 'zj-update-nokogiri' into 'master'
gems: Upgrade nokogiri to > 1.10.7
See merge request gitlab-org/gitaly!2090
(cherry picked from commit 20b29fc2c3c029385cc87d910ba5d9d1cb9b64fc)
4e123fe7 gems: Upgrade nokogiri to > 1.10.7
| -rw-r--r-- | changelogs/unreleased/zj-update-nokogiri.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-update-nokogiri.yml b/changelogs/unreleased/zj-update-nokogiri.yml new file mode 100644 index 000000000..df4375a91 --- /dev/null +++ b/changelogs/unreleased/zj-update-nokogiri.yml @@ -0,0 +1,5 @@ +--- +title: 'gems: Upgrade nokogiri to > 1.10.7' +merge_request: 2127 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index e3f786522..d5385b54b 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri |