diff options
| author | Chris Frohoff <chris@frohoff.org> | 2012-12-28 18:11:28 +0000 |
|---|---|---|
| committer | Chris Frohoff <chris@frohoff.org> | 2012-12-28 18:11:28 +0000 |
| commit | 21e55ca318bb829399c85b10e678b596d6fd414e (patch) | |
| tree | d3029235bcc15ef06a9489df40b79b280be1397f /app/mailers/notify.rb | |
| parent | e9394c48ca7aacd9d151519c1da51d18a21b351b (diff) | |
| download | gitlab-ce-21e55ca318bb829399c85b10e678b596d6fd414e.tar.gz | |
added RAILS_RELATIVE_URL_ROOT support
Diffstat (limited to 'app/mailers/notify.rb')
| -rw-r--r-- | app/mailers/notify.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 5cd9b82900c..46b8e054509 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -6,6 +6,7 @@ class Notify < ActionMailer::Base default_url_options[:host] = Gitlab.config.gitlab.host default_url_options[:protocol] = Gitlab.config.gitlab.protocol default_url_options[:port] = Gitlab.config.gitlab.port if Gitlab.config.gitlab_on_non_standard_port? + default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root default from: Gitlab.config.gitlab.email_from |