diff options
| author | Jason Plum <jplum@gitlab.com> | 2019-01-30 12:29:54 +0300 |
|---|---|---|
| committer | Jason Plum <jplum@gitlab.com> | 2019-02-13 17:00:17 +0300 |
| commit | 16d28c5a28984e12c25d50f04fdb0a6593457047 (patch) | |
| tree | 2360589601a35d11328f55d63d5b7a09dcc074d4 | |
| parent | c4953a57bb7dcb053d887d34c60cbdfec3f5757a (diff) | |
Updates to MR 1056 based on Danger
| -rw-r--r-- | _support/makegen.go | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/1365-version-fallback-file.yml | 2 |
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 |