summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorLennart Rosam <lennart.rosam@medien-systempartner.de>2013-01-28 13:04:23 +0100
committerLennart Rosam <lennart.rosam@medien-systempartner.de>2013-01-28 13:04:23 +0100
commit66ebf8d83f894ed361031eb9ede5a8b829fefd36 (patch)
treed558f782b58427169886504fb74df6723cfdfdee /lib/tasks
parentdc13af90b12a2366f77a9b68a7b74d7b5f54bc1a (diff)
parentbd948549293e1abfa32ec566b687670fed47a3d7 (diff)
downloadgitlab-ce-66ebf8d83f894ed361031eb9ede5a8b829fefd36.tar.gz
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/check.rake8
-rw-r--r--lib/tasks/sidekiq.rake2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 826b78ec5b1..1ca723f271a 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -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"),
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index 01da919d7f8..0d2ec6f332c 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -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