diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2020-04-30 11:24:11 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2020-04-30 11:24:11 +0300 |
| commit | f2a769c366d21087a27ad00662058905b507c7ef (patch) | |
| tree | a90bb9d851254ecb898c03078fbcdc93bab0e1ca | |
| parent | af304a717662f4315fcba18bf3a3a024b72fffe3 (diff) | |
| parent | 07b99e4d6ba953a46644b219eda3a41e0a280114 (diff) | |
Merge branch 'cherry-pick-20b29fc2-3' into '12-9-stable'
Pick Nokogiri upgrade to 12.9 stable
See merge request gitlab-org/gitaly!2129
| -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..fd6be4b05 --- /dev/null +++ b/changelogs/unreleased/zj-update-nokogiri.yml @@ -0,0 +1,5 @@ +--- +title: 'gems: Upgrade nokogiri to > 1.10.7' +merge_request: 2129 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 9edc452fb..9fd8df15f 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -107,7 +107,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 |