diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-16 17:48:05 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-16 17:48:05 +0300 |
commit | 297d9264f059dd502baa0a519a935e88d9dba44f (patch) | |
tree | bc219e9ad2f0eb84772aaf658a996d89e067e91a | |
parent | a1bddf693fa258a3f8d97810fcfcfa07d43b15c0 (diff) | |
parent | 7929dc1fb1a809dfc733eca82538d818eeecb360 (diff) |
Merge branch 'cc-fix-git-2-27-0' into 'master'
Fix default Git version in makegen.go
See merge request gitlab-org/gitaly!2289
-rw-r--r-- | _support/makegen.go | 2 | ||||
-rw-r--r-- | unreleased/cc-fix-git-2-27-0.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 12c408c2b..47957375d 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -336,7 +336,7 @@ func (gm *gitalyMake) GitDefaultRev() string { // Gitaly defaults to a supported version for Git, which should be a // valid tag in: https://gitlab.com/gitlab-org/gitlab-git/-/tags - return "v2.26.2" + return "v2.27.0" } func (gm *gitalyMake) GitDefaultBuildJob() string { diff --git a/unreleased/cc-fix-git-2-27-0.yml b/unreleased/cc-fix-git-2-27-0.yml new file mode 100644 index 000000000..fc47c389b --- /dev/null +++ b/unreleased/cc-fix-git-2-27-0.yml @@ -0,0 +1,6 @@ +--- +title: Fix default Git version in makegen.go +merge_request: 2289 +author: +type: deprecated + |