diff --git a/doc/release/README.md b/doc/release/README.md index 4e475d0dcbfb7e9c217c63fdadf6aa7fd37993d6_ZG9jL3JlbGVhc2UvUkVBRE1FLm1k..ee928c86c4bdbf0db94e35d245b4965826cb28ef_ZG9jL3JlbGVhc2UvUkVBRE1FLm1k 100644 --- a/doc/release/README.md +++ b/doc/release/README.md @@ -95,7 +95,7 @@ 1. Commit the new version to the release branch: ```shell - git add VERSION GITLAB_SHELL_VERSION GITLAB_WORKHORSE_VERSION GITALY_VERSION + git add VERSION GITLAB_SHELL_VERSION GITLAB_WORKHORSE_VERSION GITALY_SERVER_VERSION git commit ``` diff --git a/lib/gitlab/version.rb b/lib/gitlab/version.rb index 4e475d0dcbfb7e9c217c63fdadf6aa7fd37993d6_bGliL2dpdGxhYi92ZXJzaW9uLnJi..ee928c86c4bdbf0db94e35d245b4965826cb28ef_bGliL2dpdGxhYi92ZXJzaW9uLnJi 100644 --- a/lib/gitlab/version.rb +++ b/lib/gitlab/version.rb @@ -38,7 +38,7 @@ when "gitlab-pages" "GITLAB_PAGES_VERSION" when 'gitaly' - 'GITALY_VERSION' + 'GITALY_SERVER_VERSION' else nil end diff --git a/support/set-revisions b/support/set-revisions index 4e475d0dcbfb7e9c217c63fdadf6aa7fd37993d6_c3VwcG9ydC9zZXQtcmV2aXNpb25z..ee928c86c4bdbf0db94e35d245b4965826cb28ef_c3VwcG9ydC9zZXQtcmV2aXNpb25z 100755 --- a/support/set-revisions +++ b/support/set-revisions @@ -27,7 +27,7 @@ set_source_and_version $gitlab_rails_ref VERSION set_source_and_version $gitlab_shell_ref GITLAB_SHELL_VERSION set_source_and_version $gitlab_workhorse_ref GITLAB_WORKHORSE_VERSION - set_source_and_version $gitaly_ref GITALY_VERSION + set_source_and_version $gitaly_ref GITALY_SERVER_VERSION } # set_source_and_version foo_ref file