diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-26 04:42:46 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-26 04:42:46 +0300 |
| commit | 046b28312704f3131e72dcd2dbdacc5264d4aa62 (patch) | |
| tree | a8c2b14a6e1db3b662fee2c79af70d9fcb643c2e /bin | |
| parent | e449426a4e7d15cdd582d4f136add52cbfb5e04e (diff) | |
Groundwork for merging CI into CE
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/background_jobs | 2 | ||||
| -rw-r--r-- | bin/ci/upgrade.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/background_jobs b/bin/background_jobs index a4895cf6586..d4578f6a222 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -37,7 +37,7 @@ start_no_deamonize() start_sidekiq() { - bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 + bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 } load_ok() diff --git a/bin/ci/upgrade.rb b/bin/ci/upgrade.rb new file mode 100644 index 00000000000..aab4f60ec60 --- /dev/null +++ b/bin/ci/upgrade.rb @@ -0,0 +1,3 @@ +require_relative "../lib/ci/upgrader" + +Ci::Upgrader.new.execute |