summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-26 16:23:26 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-26 16:23:26 +0000
commitef962b84d7083b2b4d290d64b7089b596073c7be (patch)
tree91ee0de4a796fb0099b006cc2017647505f1366b /app
parenta4c4edacfdf7665c29115b8707cb2814c11abaaa (diff)
downloadredmine-ef962b84d7083b2b4d290d64b7089b596073c7be.tar.gz
redmine-ef962b84d7083b2b4d290d64b7089b596073c7be.zip
Rails3: mail: rename app/views/mailer/*.text.html.rhtml to app/views/mailer/*.html.erb (#6317)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7537 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/mailer.rb2
-rw-r--r--app/views/mailer/account_activated.html.erb (renamed from app/views/mailer/account_activated.text.html.rhtml)0
-rw-r--r--app/views/mailer/account_activation_request.html.erb (renamed from app/views/mailer/account_activation_request.text.html.rhtml)0
-rw-r--r--app/views/mailer/account_information.html.erb (renamed from app/views/mailer/account_information.text.html.rhtml)0
-rw-r--r--app/views/mailer/attachments_added.html.erb (renamed from app/views/mailer/attachments_added.text.html.rhtml)0
-rw-r--r--app/views/mailer/document_added.html.erb (renamed from app/views/mailer/document_added.text.html.rhtml)0
-rw-r--r--app/views/mailer/issue_add.html.erb (renamed from app/views/mailer/issue_add.text.html.rhtml)0
-rw-r--r--app/views/mailer/issue_edit.html.erb (renamed from app/views/mailer/issue_edit.text.html.rhtml)0
-rw-r--r--app/views/mailer/lost_password.html.erb (renamed from app/views/mailer/lost_password.text.html.rhtml)0
-rw-r--r--app/views/mailer/message_posted.html.erb (renamed from app/views/mailer/message_posted.text.html.rhtml)0
-rw-r--r--app/views/mailer/news_added.html.erb (renamed from app/views/mailer/news_added.text.html.rhtml)0
-rw-r--r--app/views/mailer/news_comment_added.html.erb (renamed from app/views/mailer/news_comment_added.text.html.rhtml)0
-rw-r--r--app/views/mailer/register.html.erb (renamed from app/views/mailer/register.text.html.rhtml)0
-rw-r--r--app/views/mailer/reminder.html.erb (renamed from app/views/mailer/reminder.text.html.rhtml)0
-rw-r--r--app/views/mailer/test.html.erb (renamed from app/views/mailer/test.text.html.rhtml)0
-rw-r--r--app/views/mailer/wiki_content_added.html.erb (renamed from app/views/mailer/wiki_content_added.text.html.rhtml)0
-rw-r--r--app/views/mailer/wiki_content_updated.html.erb (renamed from app/views/mailer/wiki_content_updated.text.html.rhtml)0
17 files changed, 1 insertions, 1 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 591f4e97c..4f5be2fc1 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -429,7 +429,7 @@ class Mailer < ActionMailer::Base
:body => render(:file => "#{method_name}.text.erb",
:body => body, :layout => 'mailer.text.erb')
part :content_type => "text/html",
- :body => render_message("#{method_name}.text.html.rhtml", body)
+ :body => render_message("#{method_name}.html.erb", body)
end
end
diff --git a/app/views/mailer/account_activated.text.html.rhtml b/app/views/mailer/account_activated.html.erb
index cb8d8caa1..cb8d8caa1 100644
--- a/app/views/mailer/account_activated.text.html.rhtml
+++ b/app/views/mailer/account_activated.html.erb
diff --git a/app/views/mailer/account_activation_request.text.html.rhtml b/app/views/mailer/account_activation_request.html.erb
index 4450631b9..4450631b9 100644
--- a/app/views/mailer/account_activation_request.text.html.rhtml
+++ b/app/views/mailer/account_activation_request.html.erb
diff --git a/app/views/mailer/account_information.text.html.rhtml b/app/views/mailer/account_information.html.erb
index 94c3297ed..94c3297ed 100644
--- a/app/views/mailer/account_information.text.html.rhtml
+++ b/app/views/mailer/account_information.html.erb
diff --git a/app/views/mailer/attachments_added.text.html.rhtml b/app/views/mailer/attachments_added.html.erb
index 11d1cf54c..11d1cf54c 100644
--- a/app/views/mailer/attachments_added.text.html.rhtml
+++ b/app/views/mailer/attachments_added.html.erb
diff --git a/app/views/mailer/document_added.text.html.rhtml b/app/views/mailer/document_added.html.erb
index 8606dd784..8606dd784 100644
--- a/app/views/mailer/document_added.text.html.rhtml
+++ b/app/views/mailer/document_added.html.erb
diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.html.erb
index bc62306c1..bc62306c1 100644
--- a/app/views/mailer/issue_add.text.html.rhtml
+++ b/app/views/mailer/issue_add.html.erb
diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.html.erb
index 05c67208e..05c67208e 100644
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ b/app/views/mailer/issue_edit.html.erb
diff --git a/app/views/mailer/lost_password.text.html.rhtml b/app/views/mailer/lost_password.html.erb
index 40bb8e9c9..40bb8e9c9 100644
--- a/app/views/mailer/lost_password.text.html.rhtml
+++ b/app/views/mailer/lost_password.html.erb
diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..f43a8cf0f 100644
--- a/app/views/mailer/message_posted.text.html.rhtml
+++ b/app/views/mailer/message_posted.html.erb
diff --git a/app/views/mailer/news_added.text.html.rhtml b/app/views/mailer/news_added.html.erb
index 758ebccb8..758ebccb8 100644
--- a/app/views/mailer/news_added.text.html.rhtml
+++ b/app/views/mailer/news_added.html.erb
diff --git a/app/views/mailer/news_comment_added.text.html.rhtml b/app/views/mailer/news_comment_added.html.erb
index ef2be0f65..ef2be0f65 100644
--- a/app/views/mailer/news_comment_added.text.html.rhtml
+++ b/app/views/mailer/news_comment_added.html.erb
diff --git a/app/views/mailer/register.text.html.rhtml b/app/views/mailer/register.html.erb
index 145c3d7c9..145c3d7c9 100644
--- a/app/views/mailer/register.text.html.rhtml
+++ b/app/views/mailer/register.html.erb
diff --git a/app/views/mailer/reminder.text.html.rhtml b/app/views/mailer/reminder.html.erb
index f011da3e8..f011da3e8 100644
--- a/app/views/mailer/reminder.text.html.rhtml
+++ b/app/views/mailer/reminder.html.erb
diff --git a/app/views/mailer/test.text.html.rhtml b/app/views/mailer/test.html.erb
index 25ad20c51..25ad20c51 100644
--- a/app/views/mailer/test.text.html.rhtml
+++ b/app/views/mailer/test.html.erb
diff --git a/app/views/mailer/wiki_content_added.text.html.rhtml b/app/views/mailer/wiki_content_added.html.erb
index 160f5730f..160f5730f 100644
--- a/app/views/mailer/wiki_content_added.text.html.rhtml
+++ b/app/views/mailer/wiki_content_added.html.erb
diff --git a/app/views/mailer/wiki_content_updated.text.html.rhtml b/app/views/mailer/wiki_content_updated.html.erb
index 8ef24d1ba..8ef24d1ba 100644
--- a/app/views/mailer/wiki_content_updated.text.html.rhtml
+++ b/app/views/mailer/wiki_content_updated.html.erb