summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-01 14:25:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-01 14:25:38 +0200
commitc27e49e916cebf87a5dc9e6cf1669d33f7e8cd8c (patch)
tree9f5242019548984192a97df99db996c2c639e2ca
parentb936314e6ba5da8ccf9779907dacf04747b49cd3 (diff)
parent1cb18edf76594aaba30d32540252e92426d0d422 (diff)
downloadgitlab-ce-c27e49e916cebf87a5dc9e6cf1669d33f7e8cd8c.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--README.md2
-rw-r--r--lib/tasks/gitlab/check.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index b1c109950a0..64e40fdc51a 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
or start each component separately
bundle exec rails s
- bundle exec rake sidekiq:start
+ script/background_jobs start
### Run the tests
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index c4f1eba9b9e..6153063b683 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -648,7 +648,7 @@ namespace :gitlab do
else
puts "no".red
try_fixing_it(
- sudo_gitlab("bundle exec rake sidekiq:start RAILS_ENV=production")
+ sudo_gitlab("RAILS_ENV=production script/background_jobs start")
)
for_more_information(
see_installation_guide_section("Install Init Script"),