summaryrefslogtreecommitdiffstats
path: root/app/models/setting.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-02-18 13:03:03 +0000
committerGo MAEDA <maeda@farend.jp>2019-02-18 13:03:03 +0000
commit5329ef3b826d9cb291951abf1b602e48732dddce (patch)
tree512cd4a815924ed04eed02b3c855f30ff3921b8d /app/models/setting.rb
parent979b0b6331db287179661594e22539331c1d8fb3 (diff)
downloadredmine-5329ef3b826d9cb291951abf1b602e48732dddce.tar.gz
redmine-5329ef3b826d9cb291951abf1b602e48732dddce.zip
Reverts r17862.
git-svn-id: http://svn.redmine.org/redmine/trunk@17878 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/setting.rb')
-rw-r--r--app/models/setting.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb
index e6de85906..e59c48c86 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -228,12 +228,6 @@ class Setting < ActiveRecord::Base
Object.const_defined?(:OpenID) && self[:openid].to_i > 0
end
- # Extracts an email address ("joe@example.com") from
- # Setting.mail_from ("Joe Bloggs <joe@example.com>")
- def self.mail_from_address
- self.mail_from.to_s.gsub(/(?:.*<|>.*|\(.*\))/, '').strip
- end
-
# Checks if settings have changed since the values were read
# and clears the cache hash if it's the case
# Called once per request