kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-16 14:42:22 +02:00
parent e65cc4f849
commit b729728536
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -20,6 +20,7 @@ config/database.yml
config/initializers/omniauth.rb config/initializers/omniauth.rb
config/unicorn.rb config/unicorn.rb
config/resque.yml config/resque.yml
config/aws.yml
db/data.yml db/data.yml
.idea .idea
.DS_Store .DS_Store

4
app/views/help/index.html.haml
View file

@ -1,8 +1,8 @@
%h3.page_title %h3.page_title
GITLAB GITLAB
.pull-right .pull-right
%span= Gitlab::Version %span= Gitlab::VERSION
%small= Gitlab::Revision %small= Gitlab::REVISION
%hr %hr
%p.lead %p.lead
Self Hosted Git Management Self Hosted Git Management

4
config/initializers/2_app.rb
View file

@ -1,6 +1,6 @@
module Gitlab module Gitlab
Version = File.read(Rails.root.join("VERSION")) VERSION = File.read(Rails.root.join("VERSION")).strip
Revision = `git log --pretty=format:'%h' -n 1` REVISION = `git log --pretty=format:'%h' -n 1`
def self.config def self.config
Settings Settings

4
lib/api/internal.rb
View file

@ -40,7 +40,9 @@ module Gitlab
get "/check" do get "/check" do
{ {
api_version: '3' api_version: Gitlab::API.version,
gitlab_version: Gitlab::VERSION,
gitlab_rev: Gitlab::REVISION,
} }
end end
end end

4
lib/tasks/gitlab/info.rake
View file

@ -40,8 +40,8 @@ namespace :gitlab do
puts "" puts ""
puts "GitLab information".yellow puts "GitLab information".yellow
puts "Version:\t#{Gitlab::Version}" puts "Version:\t#{Gitlab::VERSION}"
puts "Revision:\t#{Gitlab::Revision}" puts "Revision:\t#{Gitlab::REVISION}"
puts "Directory:\t#{Rails.root}" puts "Directory:\t#{Rails.root}"
puts "DB Adapter:\t#{database_adapter}" puts "DB Adapter:\t#{database_adapter}"
puts "URL:\t\t#{Gitlab.config.gitlab.url}" puts "URL:\t\t#{Gitlab.config.gitlab.url}"