Commit b7297285 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

uppercase Gitlab version and revision constants. check api return gitlab version now

parent 3d815088336d
......@@ -20,6 +20,7 @@ config/database.yml
config/initializers/omniauth.rb
config/unicorn.rb
config/resque.yml
config/aws.yml
db/data.yml
.idea
.DS_Store
......
%h3.page_title
GITLAB
.pull-right
%span= Gitlab::Version
%small= Gitlab::Revision
%span= Gitlab::VERSION
%small= Gitlab::REVISION
%hr
%p.lead
Self Hosted Git Management
......
module Gitlab
Version = File.read(Rails.root.join("VERSION"))
Revision = `git log --pretty=format:'%h' -n 1`
VERSION = File.read(Rails.root.join("VERSION")).strip
REVISION = `git log --pretty=format:'%h' -n 1`
def self.config
Settings
......
......@@ -40,7 +40,9 @@ class Internal < Grape::API
get "/check" do
{
api_version: '3'
api_version: Gitlab::API.version,
gitlab_version: Gitlab::VERSION,
gitlab_rev: Gitlab::REVISION,
}
end
end
......
......@@ -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}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment