summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 12:10:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 12:10:03 +0000
commit38a1a6cb91bd4cd95d18db9a4bfd219bfb75401b (patch)
tree7b3d217aa21180af6256b99a8a6ba76775edd4b8 /config/environments
parente6779ab919283efbd93a0e3ed2356c58b19f9c93 (diff)
downloadgitlab-ce-38a1a6cb91bd4cd95d18db9a4bfd219bfb75401b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/development.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 50d394859bc..92de88394c6 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -50,7 +50,7 @@ Rails.application.configure do
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'
+ config.action_mailer.preview_path = "#{Rails.root}{/ee,}/app/mailers/previews"
config.eager_load = false