diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 00:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 00:08:52 +0300 |
| commit | d5d3c03598df712550acf0c6463a61c6e7dcc19e (patch) | |
| tree | d0fdf0f9cd6df46aea6ed16b6556f44055efb642 /config | |
| parent | 0434f38ef1dce4fe640fe1e4542235746ceb943c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/mail_room.yml | 8 | ||||
| -rw-r--r-- | config/routes/explore.rb | 2 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index 75024c2b2e1..da37ef60587 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -1,9 +1,7 @@ :mailboxes: <% require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) - config = Gitlab::MailRoom.config - - if Gitlab::MailRoom.enabled? + Gitlab::MailRoom.enabled_configs.each do |config| %> - :host: <%= config[:host].to_json %> @@ -24,8 +22,8 @@ :delivery_options: :redis_url: <%= config[:redis_url].to_json %> :namespace: <%= Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE %> - :queue: email_receiver - :worker: EmailReceiverWorker + :queue: <%= config[:queue] %> + :worker: <%= config[:worker] %> <% if config[:sentinels] %> :sentinels: <% config[:sentinels].each do |sentinel| %> diff --git a/config/routes/explore.rb b/config/routes/explore.rb index 42ec5e8abec..59b53bdcf42 100644 --- a/config/routes/explore.rb +++ b/config/routes/explore.rb @@ -8,7 +8,7 @@ namespace :explore do resources :groups, only: [:index] resources :snippets, only: [:index] - root to: 'projects#trending' + root to: 'projects#index' end # Compatibility with old routing diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 8974b646cd9..1e1ed52650b 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -224,6 +224,8 @@ - 2 - - self_monitoring_project_delete - 2 +- - service_desk_email_receiver + - 1 - - system_hook_push - 1 - - todos_destroyer |