diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 39e59983..29c65b82 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -74,10 +74,6 @@ h5 { font-size:14px; } -code { - background:#FCEEC1; - color:$style_color; -} table { width:100%; diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 6052ec3f..35c3cffd 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -194,4 +194,9 @@ float:right; @extend .cgray; } + + code { + background:#FCEEC1; + color:$style_color; + } } diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml index ccee7573..eb09d214 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -1,19 +1,30 @@ .alert-message.block-message.error %h3 Gitolite Error - %hr %h4 Application cant get access to your gitolite system. - %ol - %li - %p - Check 'config/gitlab.yml' for correct settings. - %li - %p - Make sure web server user has access to gitolite. - %a{:href => "https://github.com/gitlabhq/gitlabhq/wiki/Gitolite"} Setup tutorial - %li - %p - Try: + + + + +%h4 Tips for Administrator: + +%ul + %li + %p + Check git logs in admin area + %li + %p + Check config/gitlab.yml for correct settings. + %li + %p + Diagnostic tool: %pre - = preserve do - sudo chmod -R 770 /home/git/repositories/ - sudo chown -R git:git /home/git/repositories/ + bundle exec rake gitlab:app:status RAILS_ENV=production + %li + %p + Permissions: + %pre + = preserve do + sudo chmod -R 770 /home/git/repositories/ + sudo chown -R git:git /home/git/repositories/ + sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive + diff --git a/doc/installation.md b/doc/installation.md index 3dfedfe1..cb54663e 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -119,6 +119,7 @@ Permissions: sudo chmod -R g+rwX /home/git/repositories/ sudo chown -R git:git /home/git/repositories/ + sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive #### CHECK: Logout & login again to apply git group to your user diff --git a/lib/tasks/gitlab/status.rake b/lib/tasks/gitlab/status.rake index ac712234..96b8886f 100644 --- a/lib/tasks/gitlab/status.rake +++ b/lib/tasks/gitlab/status.rake @@ -2,7 +2,7 @@ namespace :gitlab do namespace :app do desc "GITLAB | Check gitlab installation status" task :status => :environment do - puts "Starting diagnostic" + puts "Starting diagnostic".yellow git_base_path = Gitlab.config.git_base_path print "config/database.yml............" @@ -56,7 +56,28 @@ namespace :gitlab do return end - puts "\nFinished" + if Project.count > 0 + puts "Validating projects repositories:".yellow + Project.find_each(:batch_size => 100) do |project| + print "#{project.name}....." + hook_file = File.join(project.path_to_repo, 'hooks','post-receive') + + unless File.exists?(hook_file) + puts "post-receive file missing".red + next + end + + + unless File.owned?(hook_file) + puts "post-receive file is not owner by gitlab".red + next + end + + puts "post-reveice file ok".green + end + end + + puts "\nFinished".blue end end end