Commit 539e06ef authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ce-5448-move-mailers-previews' into 'master'

CE: Move mailer preview to app directory

See merge request gitlab-org/gitlab-ce!20430
parents 4b225b1a 66db5531
...@@ -153,7 +153,7 @@ class NotifyPreview < ActionMailer::Preview ...@@ -153,7 +153,7 @@ class NotifyPreview < ActionMailer::Preview
cleanup do cleanup do
note = yield note = yield
Notify.public_send(method, user.id, note) Notify.public_send(method, user.id, note) # rubocop:disable GitlabSecurity/PublicSend
end end
end end
......
...@@ -39,7 +39,7 @@ Rails.application.configure do ...@@ -39,7 +39,7 @@ Rails.application.configure do
config.action_mailer.delivery_method = :letter_opener_web config.action_mailer.delivery_method = :letter_opener_web
# Don't make a mess when bootstrapping a development environment # Don't make a mess when bootstrapping a development environment
config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1')
config.action_mailer.preview_path = 'spec/mailers/previews' config.action_mailer.preview_path = 'app/mailers/previews'
config.eager_load = false config.eager_load = false
......
...@@ -10,12 +10,12 @@ To view rendered emails "sent" in your development instance, visit ...@@ -10,12 +10,12 @@ To view rendered emails "sent" in your development instance, visit
Rails provides a way to preview our mailer templates in HTML and plaintext using Rails provides a way to preview our mailer templates in HTML and plaintext using
dummy data. dummy data.
The previews live in [`spec/mailers/previews`][previews] and can be viewed at The previews live in [`app/mailers/previews`][previews] and can be viewed at
[`/rails/mailers`](http://localhost:3000/rails/mailers). [`/rails/mailers`](http://localhost:3000/rails/mailers).
See the [Rails guides] for more info. See the [Rails guides] for more info.
[previews]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/spec/mailers/previews [previews]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/app/mailers/previews
[Rails guides]: http://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails [Rails guides]: http://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails
## Incoming email ## Incoming email
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment