diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-05 00:05:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-05 00:05:57 +0300 |
| commit | a2022f4a2e4bda90ca89981f4af851a3068343d0 (patch) | |
| tree | 0d9b5467809581bbf8b2e94aedd1bcc5091d6f29 /config | |
| parent | 5e5da0f1ee3ae379d4706aac683e92bd285611ab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 5 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 3881f1be152..2939e13ef94 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,9 +11,6 @@ Rails.application.configure do config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger config.active_support.deprecation = :log @@ -38,6 +35,8 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Open sent mails in browser config.action_mailer.delivery_method = :letter_opener_web + # Log mail delivery errors + config.action_mailer.raise_delivery_errors = true # Don't make a mess when bootstrapping a development environment config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') config.action_mailer.preview_path = 'app/mailers/previews' diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 6b0741667bd..34a8bba498f 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -49,7 +49,7 @@ - [delete_user, 1] - [todos_destroyer, 1] - [delete_merged_branches, 1] - - [authorized_projects, 1] + - [authorized_projects, 2] - [expire_build_instance_artifacts, 1] - [group_destroy, 1] - [irker, 1] |