diff options
| author | John Cai <jcai@gitlab.com> | 2020-01-24 23:04:03 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2020-01-24 23:04:03 +0300 |
| commit | eda8e271eeaf9fcbe656309d49b6c00b5f971d3a (patch) | |
| tree | 696cc0080fdf93334e1a61a00623488d3392490c | |
| parent | 1ef0443ab045b602eb2a8e076f3d5c3f5e4226db (diff) | |
| parent | bf0af8356c4f4b40c602413b1fd38cb41f618739 (diff) | |
Merge branch 'zj-bump-yaml.v2' into 'master'
Bump go-YAML and Rack dependencies
See merge request gitlab-org/gitaly!1785
| -rw-r--r-- | changelogs/unreleased/zj-bump-yaml-v2.yml | 5 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/changelogs/unreleased/zj-bump-yaml-v2.yml b/changelogs/unreleased/zj-bump-yaml-v2.yml new file mode 100644 index 000000000..514fd06cd --- /dev/null +++ b/changelogs/unreleased/zj-bump-yaml-v2.yml @@ -0,0 +1,5 @@ +--- +title: Bump go-yaml and the rack gem dependencies +merge_request: +author: +type: security @@ -24,7 +24,7 @@ require ( golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898 // indirect google.golang.org/grpc v1.24.0 - gopkg.in/yaml.v2 v2.2.5 + gopkg.in/yaml.v2 v2.2.8 ) go 1.12 @@ -360,5 +360,7 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index cfc9ceef3..26a1a0fd7 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -132,7 +132,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) - rack (2.0.7) + rack (2.1.1) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) |