From 1109c7304dcebd9830bb57d9381c2ad63f4183f3 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Thu, 30 Apr 2020 14:24:00 +0000 Subject: Update CHANGELOG.md for 12.8.10 [ci skip] --- CHANGELOG.md | 7 +++++++ changelogs/unreleased/zj-update-nokogiri.yml | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/zj-update-nokogiri.yml 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. 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 -- cgit v1.2.3 From 956446966a2ff423f948536bc94d4508db01fd1f Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Thu, 30 Apr 2020 14:24:06 +0000 Subject: Update VERSION to 12.8.10 --- VERSION | 2 +- ruby/proto/gitaly/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a4fef53f7..59714838f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.8.9 +12.8.10 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 -- cgit v1.2.3