diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-04-30 22:28:43 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-04-30 22:28:43 +0300 |
| commit | 38284379be33a37f6bd37bc7ce67776abecc2af2 (patch) | |
| tree | 37a4aa304b3cab9a138f5ea62ee793357f9ec822 | |
| parent | 0b3d0222d8cb6d782ff835b8a33682a58f218e41 (diff) | |
| parent | 956446966a2ff423f948536bc94d4508db01fd1f (diff) | |
Merge remote-tracking branch 'dev/12-8-stable' into 12-8-stable12-8-stable
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-update-nokogiri.yml | 5 | ||||
| -rw-r--r-- | ruby/proto/gitaly/version.rb | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c8ec53a..93d376636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Gitaly changelog +## 12.8.10 + +### Security (1 change) + +- gems: Upgrade nokogiri to > 1.10.7. !2127 + + ## 12.8.9 - No changes. @@ -1 +1 @@ -12.8.9 +12.8.10 diff --git a/changelogs/unreleased/zj-update-nokogiri.yml b/changelogs/unreleased/zj-update-nokogiri.yml deleted file mode 100644 index df4375a91..000000000 --- a/changelogs/unreleased/zj-update-nokogiri.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'gems: Upgrade nokogiri to > 1.10.7' -merge_request: 2127 -author: -type: security diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb index 7e977e662..a50af187b 100644 --- a/ruby/proto/gitaly/version.rb +++ b/ruby/proto/gitaly/version.rb @@ -1,5 +1,5 @@ # This file was auto-generated by release-tools # https://gitlab.com/gitlab-org/release-tools/-/blob/master/lib/release_tools/release/gitaly_release.rb module Gitaly - VERSION = '12.8.9' + VERSION = '12.8.10' end |