uppercase Gitlab version and revision constants. check api return gitlab version now
This commit is contained in:
parent
e65cc4f849
commit
b729728536
5 changed files with 10 additions and 7 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -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
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
%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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
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 @@ module Gitlab
|
|||
|
||||
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}"
|
||||
|
|
Loading…
Reference in a new issue