From be3c1e0908742d6c1150370e4c236446381d0683 Mon Sep 17 00:00:00 2001 From: John Cai Date: Wed, 1 May 2019 11:49:33 -0700 Subject: Version 1.38.0 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- changelogs/unreleased/sh-upgrade-rubocop.yml | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/sh-upgrade-rubocop.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 840224de8..c54203d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Gitaly changelog +## v1.38.0 + +#### Other +- Upgrade Rubocop to 0.68.1 + https://gitlab.com/gitlab-org/gitaly/merge_requests/1229 + ## v1.37.0 #### Added diff --git a/VERSION b/VERSION index bf50e910e..ebeef2f2d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.37.0 +1.38.0 diff --git a/changelogs/unreleased/sh-upgrade-rubocop.yml b/changelogs/unreleased/sh-upgrade-rubocop.yml deleted file mode 100644 index 96fbfc9a4..000000000 --- a/changelogs/unreleased/sh-upgrade-rubocop.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Rubocop to 0.68.1 -merge_request: 1229 -author: -type: other -- cgit v1.2.3