From b7297285369171c95b006e49d6da7bc84b969fc8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 16 Feb 2013 14:42:22 +0200
Subject: uppercase Gitlab version and revision constants. check api return
 gitlab version now

---
 lib/api/internal.rb        | 4 +++-
 lib/tasks/gitlab/info.rake | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

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
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index c44016ef6e8..091de6ee6d5 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -40,8 +40,8 @@ namespace :gitlab do
 
       puts ""
       puts "GitLab information".yellow
-      puts "Version:\t#{Gitlab::Version}"
-      puts "Revision:\t#{Gitlab::Revision}"
+      puts "Version:\t#{Gitlab::VERSION}"
+      puts "Revision:\t#{Gitlab::REVISION}"
       puts "Directory:\t#{Rails.root}"
       puts "DB Adapter:\t#{database_adapter}"
       puts "URL:\t\t#{Gitlab.config.gitlab.url}"
-- 
cgit v1.2.1