meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity

Adds instance name to the security notification subject (#21421).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15269 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-03-20 07:49:15 +00:00
parent af3e34f223
commit 09197a22e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/mailer.rb
View File

@ -339,7 +339,7 @@ class Mailer < ActionMailer::Base
@title = options[:title] && l(options[:title]) @title = options[:title] && l(options[:title])
@url = options[:url] && (options[:url].is_a?(Hash) ? url_for(options[:url]) : options[:url]) @url = options[:url] && (options[:url].is_a?(Hash) ? url_for(options[:url]) : options[:url])
mail :to => recipients, mail :to => recipients,
:subject => l(:mail_subject_security_notification) :subject => "[#{Setting.app_title}] #{l(:mail_subject_security_notification)}"
end end
def settings_updated(recipients, changes) def settings_updated(recipients, changes)
@ -347,7 +347,7 @@ class Mailer < ActionMailer::Base
@changes = changes @changes = changes
@url = url_for(controller: 'settings', action: 'index') @url = url_for(controller: 'settings', action: 'index')
mail :to => recipients, mail :to => recipients,
:subject => l(:mail_subject_security_notification) :subject => "[#{Setting.app_title}] #{l(:mail_subject_security_notification)}"
end end
# Notifies admins about settings changes # Notifies admins about settings changes