Merge branch 'use_mailers_queue' into 'master'

Mailer queue is renamed to mailers.

Fixes #975 

See merge request !553
This commit is contained in:
Marin Jankovski 2015-12-03 14:13:12 +00:00
commit d4d5273407
2 changed files with 2 additions and 1 deletions

View File

@ -8,6 +8,7 @@ omnibus-gitlab repository.
- Add sidekiq concurrency setting 787aa2ffc3b50783ae17e32d69e4b8efae8ca9ac
- Explicitly create directory that holds the logs 50caed92198aef685c8e7815a67bcb13d9ebf911
- Updated omnibus to v5.0.0 18835f14453fd4fb834d228caf1bc1b37f1fe910
- Change mailer to mailers sidekiq queue
8.2.1

View File

@ -8,7 +8,7 @@ exec chpst -e /opt/gitlab/etc/<%= @options[:rails_app] %>/env -P \
-U <%= @options[:user] %> -u <%= @options[:user] %> \
/opt/gitlab/embedded/bin/bundle exec sidekiq \
-q post_receive \
-q mailer \
-q mailers \
-q archive_repo \
-q system_hook \
-q project_web_hook \