diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-26 02:18:09 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-26 02:46:04 +0300 |
| commit | aa9435cddbe57841b4572e05fb4e7756f8b47405 (patch) | |
| tree | 8b456eabdb38ffa2bd4bdecfdfec5a776135a417 /app/mailers | |
| parent | 439b9f50af3168d33169a4cd25b59e45ea46dc62 (diff) | |
Remove duplicate settings for default_url_options
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notify.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 2c0d451511f..79fb48b00d3 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -16,11 +16,6 @@ class Notify < ActionMailer::Base attr_accessor :current_user helper_method :current_user, :can? - default_url_options[:host] = Gitlab.config.gitlab.host - default_url_options[:protocol] = Gitlab.config.gitlab.protocol - default_url_options[:port] = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port? - default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root - default from: Proc.new { default_sender_address.format } default reply_to: Gitlab.config.gitlab.email_reply_to @@ -69,7 +64,7 @@ class Notify < ActionMailer::Base # Only the displayed name changes; the actual email address is always the same. def sender(sender_id, send_from_user_email = false) return unless sender = User.find(sender_id) - + address = default_sender_address address.display_name = sender.name |