From c83381938aafe6d5e7da8890150ba285a2533665 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 6 Jul 2018 20:17:54 +0800 Subject: [PATCH] Move spec/mailers/previews to app/mailers/previews --- {spec => app}/mailers/previews/devise_mailer_preview.rb | 0 .../mailers/previews/email_rejection_mailer_preview.rb | 0 {spec => app}/mailers/previews/notify_preview.rb | 0 .../mailers/previews/repository_check_mailer_preview.rb | 0 config/environments/development.rb | 2 +- doc/development/emails.md | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename {spec => app}/mailers/previews/devise_mailer_preview.rb (100%) rename {spec => app}/mailers/previews/email_rejection_mailer_preview.rb (100%) rename {spec => app}/mailers/previews/notify_preview.rb (100%) rename {spec => app}/mailers/previews/repository_check_mailer_preview.rb (100%) diff --git a/spec/mailers/previews/devise_mailer_preview.rb b/app/mailers/previews/devise_mailer_preview.rb similarity index 100% rename from spec/mailers/previews/devise_mailer_preview.rb rename to app/mailers/previews/devise_mailer_preview.rb diff --git a/spec/mailers/previews/email_rejection_mailer_preview.rb b/app/mailers/previews/email_rejection_mailer_preview.rb similarity index 100% rename from spec/mailers/previews/email_rejection_mailer_preview.rb rename to app/mailers/previews/email_rejection_mailer_preview.rb diff --git a/spec/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb similarity index 100% rename from spec/mailers/previews/notify_preview.rb rename to app/mailers/previews/notify_preview.rb diff --git a/spec/mailers/previews/repository_check_mailer_preview.rb b/app/mailers/previews/repository_check_mailer_preview.rb similarity index 100% rename from spec/mailers/previews/repository_check_mailer_preview.rb rename to app/mailers/previews/repository_check_mailer_preview.rb diff --git a/config/environments/development.rb b/config/environments/development.rb index 45a8c1add3e..23790b84e3c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -39,7 +39,7 @@ Rails.application.configure do config.action_mailer.delivery_method = :letter_opener_web # Don't make a mess when bootstrapping a development environment 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 diff --git a/doc/development/emails.md b/doc/development/emails.md index 73cac82caf0..35ada35babe 100644 --- a/doc/development/emails.md +++ b/doc/development/emails.md @@ -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 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). 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 ## Incoming email -- GitLab