Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_support/makegen.go2
-rw-r--r--changelogs/unreleased/1365-version-fallback-file.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/_support/makegen.go b/_support/makegen.go
index f4685760a..e0ed5e28f 100644
--- a/_support/makegen.go
+++ b/_support/makegen.go
@@ -152,7 +152,7 @@ func (gm *gitalyMake) VersionFromFile() string {
log.Printf("Unable to obtain version from VERSION file.")
return "unknown"
}
- return fmt.Sprintf("v%s",strings.TrimSpace(string(data)))
+ return fmt.Sprintf("v%s", strings.TrimSpace(string(data)))
}
func (gm *gitalyMake) VersionFromGit() string {
diff --git a/changelogs/unreleased/1365-version-fallback-file.yml b/changelogs/unreleased/1365-version-fallback-file.yml
index 3f0080715..644a3af56 100644
--- a/changelogs/unreleased/1365-version-fallback-file.yml
+++ b/changelogs/unreleased/1365-version-fallback-file.yml
@@ -1,5 +1,5 @@
---
-title: Allow version detection from file, if git fails
+title: Use VERSION file to detect version as fallback
merge_request: 1056
author:
type: fixed