diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 18:33:41 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 18:33:41 +0000 |
| commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
| tree | c4fdd4076025bb5b612bc88debab62709c311e5f /lib/api/version.rb | |
| parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
| parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) | |
| download | gitlab-ce-cb1e4a8abb33a32da9bec300e0259d50fa2afea9.tar.gz | |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'lib/api/version.rb')
| -rw-r--r-- | lib/api/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/version.rb b/lib/api/version.rb index 9ba576bd828..3b10bfa6a7d 100644 --- a/lib/api/version.rb +++ b/lib/api/version.rb @@ -6,7 +6,7 @@ module API detail 'This feature was introduced in GitLab 8.13.' end get '/version' do - { version: Gitlab::VERSION, revision: Gitlab::REVISION } + { version: Gitlab::VERSION, revision: Gitlab.revision } end end end |