diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
| commit | eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a (patch) | |
| tree | 9dc7d17953ee7851e1934903b45faf5f18d860a2 /lib/api/internal.rb | |
| parent | 1b97a2eee8b89320de891e3ae8496adfa7f3a84b (diff) | |
| parent | b7ac654b88aa9b03f431d93c25e397ff2bc66a7a (diff) | |
| download | gitlab-ce-eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a.tar.gz | |
Merge branch 'master' into fixes/api
Conflicts:
spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 3e5e3a478ba..5d74a761c05 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -40,7 +40,9 @@ module Gitlab get "/check" do { - api_version: '3' + api_version: Gitlab::API.version, + gitlab_version: Gitlab::VERSION, + gitlab_rev: Gitlab::REVISION, } end end |