diff options
| author | John Cai <jcai@gitlab.com> | 2019-08-12 22:08:44 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-08-12 22:08:44 +0300 |
| commit | a3d82f943f96839989a9bed8b6ac8c17ca497fb2 (patch) | |
| tree | ee0b8e595402ccd7587304c80ebb646ec0415258 | |
| parent | 1df5f4fffb8a1c153a7220d8f2f74036cb5cf665 (diff) | |
| parent | 6ebf8bf91b9ae0a28e4c66b033130b4de96a314d (diff) | |
Merge branch 'bump_nokogiri-1.10.4' into 'master'
Bump nokogiri to 1.10.4
See merge request gitlab-org/gitaly!1415
| -rw-r--r-- | changelogs/unreleased/bump_nokogiri-1-10-4.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/bump_nokogiri-1-10-4.yml b/changelogs/unreleased/bump_nokogiri-1-10-4.yml new file mode 100644 index 000000000..3dbacfdd9 --- /dev/null +++ b/changelogs/unreleased/bump_nokogiri-1-10-4.yml @@ -0,0 +1,5 @@ +--- +title: Bump nokogiri to 1.10.4 +merge_request: 1415 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index be60d20a7..69d70e98a 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -112,7 +112,7 @@ GEM msgpack (1.3.0) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri |