From 8dd76a7a6ff1bb7105beabb8f834ca54ab1e5fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
<rafaelmfranca@gmail.com>
Date: Mon, 13 Nov 2017 15:23:28 -0500
Subject: Use .tt extension to all the template files
Make clear that the files are not to be run for interpreters.
Fixes #23847.
Fixes #30690.
Closes #23878.
---
.../generators/mailer/templates/application_mailer.rb | 6 ------
.../mailer/templates/application_mailer.rb.tt | 6 ++++++
.../lib/rails/generators/mailer/templates/mailer.rb | 17 -----------------
.../lib/rails/generators/mailer/templates/mailer.rb.tt | 17 +++++++++++++++++
4 files changed, 23 insertions(+), 23 deletions(-)
delete mode 100644 actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb
create mode 100644 actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb.tt
delete mode 100644 actionmailer/lib/rails/generators/mailer/templates/mailer.rb
create mode 100644 actionmailer/lib/rails/generators/mailer/templates/mailer.rb.tt
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb
deleted file mode 100644
index 00fb9bd48f..0000000000
--- a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% module_namespacing do -%>
-class ApplicationMailer < ActionMailer::Base
- default from: 'from@example.com'
- layout 'mailer'
-end
-<% end %>
diff --git a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb.tt b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb.tt
new file mode 100644
index 0000000000..00fb9bd48f
--- /dev/null
+++ b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb.tt
@@ -0,0 +1,6 @@
+<% module_namespacing do -%>
+class ApplicationMailer < ActionMailer::Base
+ default from: 'from@example.com'
+ layout 'mailer'
+end
+<% end %>
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
deleted file mode 100644
index 348d314758..0000000000
--- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% module_namespacing do -%>
-class <%= class_name %>Mailer < ApplicationMailer
-<% actions.each do |action| -%>
-
- # Subject can be set in your I18n file at config/locales/en.yml
- # with the following lookup:
- #
- # en.<%= file_path.tr("/",".") %>_mailer.<%= action %>.subject
- #
- def <%= action %>
- @greeting = "Hi"
-
- mail to: "to@example.org"
- end
-<% end -%>
-end
-<% end -%>
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb.tt b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb.tt
new file mode 100644
index 0000000000..348d314758
--- /dev/null
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb.tt
@@ -0,0 +1,17 @@
+<% module_namespacing do -%>
+class <%= class_name %>Mailer < ApplicationMailer
+<% actions.each do |action| -%>
+
+ # Subject can be set in your I18n file at config/locales/en.yml
+ # with the following lookup:
+ #
+ # en.<%= file_path.tr("/",".") %>_mailer.<%= action %>.subject
+ #
+ def <%= action %>
+ @greeting = "Hi"
+
+ mail to: "to@example.org"
+ end
+<% end -%>
+end
+<% end -%>
--
cgit v1.2.3
From 908aaa650eadde6f732f7df6c6dcc4caaaf1c8d6 Mon Sep 17 00:00:00 2001
From: Dwight Watson <dwightwatson@me.com>
Date: Tue, 14 Nov 2017 10:16:27 +1100
Subject: Sort mailer previews
---
actionmailer/lib/action_mailer/preview.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index 730ac89c94..0aea84fd2b 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -104,7 +104,7 @@ module ActionMailer
private
def load_previews
if preview_path
- Dir["#{preview_path}/**/*_preview.rb"].each { |file| require_dependency file }
+ Dir["#{preview_path}/**/*_preview.rb"].sort.each { |file| require_dependency file }
end
end
--
cgit v1.2.3