deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'github/master'

Browse source
This commit is contained in:
Lennart Rosam 2013-01-28 13:04:23 +01:00
commit 66ebf8d83f
183 changed files with 3804 additions and 771 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/tasks/gitlab/check.rake
View file

@ -169,7 +169,7 @@ namespace :gitlab do
else
puts "no".red
try_fixing_it(
sudo_gitlab("bundle exec rake db:migrate")
sudo_gitlab("bundle exec rake db:migrate RAILS_ENV=production")
)
fix_and_rerun
end
@ -194,7 +194,7 @@ namespace :gitlab do
else
puts "no".red
try_fixing_it(
sudo_gitlab("bundle exec rake gitlab:satellites:create"),
sudo_gitlab("bundle exec rake gitlab:satellites:create RAILS_ENV=production"),
"If necessary, remove the tmp/repo_satellites directory ...",
"... and rerun the above command"
)
@ -789,7 +789,7 @@ namespace :gitlab do
else
puts "wrong or missing".red
try_fixing_it(
sudo_gitlab("bundle exec rake gitlab:gitolite:update_repos")
sudo_gitlab("bundle exec rake gitlab:gitolite:update_repos RAILS_ENV=production")
)
for_more_information(
"doc/raketasks/maintenance.md"
@ -895,7 +895,7 @@ namespace :gitlab do
else
puts "no".red
try_fixing_it(
sudo_gitlab("bundle exec rake sidekiq:start")
sudo_gitlab("bundle exec rake sidekiq:start RAILS_ENV=production")
)
for_more_information(
see_installation_guide_section("Install Init Script"),

2
lib/tasks/sidekiq.rake
View file

@ -6,7 +6,7 @@ namespace :sidekiq do
desc "GITLAB | Start sidekiq"
task :start do
run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
end
def pidfile