diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-09-16 20:52:35 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-09-16 20:52:35 +0300 |
| commit | bb215faacd87e57e832abb3b6ac30870c7b3a186 (patch) | |
| tree | 2092f979b750100e518c2a9c11fdfe133058becd | |
| parent | b670554eae8643f2072d3b4f6f7c5cd2b9ec8776 (diff) | |
| parent | 7c8b0f7ff44c0dcc0a0611b7def87bb0249f1af2 (diff) | |
Merge branch 'sh-update-nokogiri' into 'master'
Update Nokogiri gem to v1.10.10
See merge request gitlab-org/gitaly!2567
| -rw-r--r-- | changelogs/unreleased/sh-update-nokogiri.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-update-nokogiri.yml b/changelogs/unreleased/sh-update-nokogiri.yml new file mode 100644 index 000000000..eef392f49 --- /dev/null +++ b/changelogs/unreleased/sh-update-nokogiri.yml @@ -0,0 +1,5 @@ +--- +title: Update Nokogiri gem to v1.10.10 +merge_request: 2567 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 19dc85ff4..456f20130 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -108,7 +108,7 @@ GEM minitest (5.14.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri |