diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-04-23 10:08:02 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-04-23 10:08:02 +0300 |
| commit | 20b29fc2c3c029385cc87d910ba5d9d1cb9b64fc (patch) | |
| tree | 025fab6710754e309be16d5e08c70a6c9c0e565e | |
| parent | 2237ee0ab6559fde1a9cce0c52e283a11d511830 (diff) | |
| parent | 4e123fe7c0d560a02c76f57891701c5155cda4a1 (diff) | |
Merge branch 'zj-update-nokogiri' into 'master'
gems: Upgrade nokogiri to > 1.10.7
See merge request gitlab-org/gitaly!2090
| -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..4b991714b --- /dev/null +++ b/changelogs/unreleased/zj-update-nokogiri.yml @@ -0,0 +1,5 @@ +--- +title: 'gems: Upgrade nokogiri to > 1.10.7' +merge_request: 2090 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 835973a20..c5fb5dff5 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 |