diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 18:11:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 18:11:31 +0300 |
| commit | e6fa9529b4922a4c552e8908a2929ff995e8b53d (patch) | |
| tree | 9ccfea4d253faa8c202f753631961a794af44ad6 /lib/gitlab/gitaly_client.rb | |
| parent | 720cf698151643831bf36e3bd4ccd1c8e9246184 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 996534f4194..870d93a951f 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -370,6 +370,8 @@ module Gitlab end def self.expected_server_version + return ENV[SERVER_VERSION_FILE] if ENV[SERVER_VERSION_FILE] + path = Rails.root.join(SERVER_VERSION_FILE) path.read.chomp end |