diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 12:09:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 12:09:14 +0000 |
| commit | 49089d4fb1f5c17328ac61c955d95a68c6d4d545 (patch) | |
| tree | 309d97ce6cbc1b22935dd0e11cc72abd767ffcf3 /config | |
| parent | 846a84f2e9d6149b00c63ccae2850421f6766bac (diff) | |
| download | gitlab-ce-49089d4fb1f5c17328ac61c955d95a68c6d4d545.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 47f8ca48d91..772b3b042c1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -158,6 +158,8 @@ module Gitlab # Webpack dev server configuration is handled in initializers/static_files.rb config.webpack.dev_server.enabled = false + config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" + # Enable the asset pipeline config.assets.enabled = true |