Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-16 16:42:22 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-16 16:42:22 +0400
commitb7297285369171c95b006e49d6da7bc84b969fc8 (patch)
tree9e5a93a2bd32439cf1033444890d452e33cf8cfa /lib
parente65cc4f849174e2767f2121120ea8f1880c3d6d2 (diff)
uppercase Gitlab version and revision constants. check api return gitlab version now
Diffstat (limited to 'lib')
-rw-r--r--lib/api/internal.rb4
-rw-r--r--lib/tasks/gitlab/info.rake4
2 files changed, 5 insertions, 3 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
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}"