diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 07:55:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 07:55:30 +0000 |
| commit | e322bdbd5ea9de9bf2b7a5c1efb115e294289918 (patch) | |
| tree | de35308c2012f8a804930b4ba716cd85900b4d59 /app | |
| parent | 3713fc6cdfc45506668a1678503fac8e48221df0 (diff) | |
| parent | 39a2adf4f49981dda9ab3e0d6a23b74acccbe128 (diff) | |
| download | gitlab-ce-e322bdbd5ea9de9bf2b7a5c1efb115e294289918.tar.gz | |
Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
Diffstat (limited to 'app')
| -rw-r--r-- | app/mailers/notify.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index aec4c57cba8..6c1a3328960 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -12,7 +12,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[: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: Gitlab.config.gitlab.email_from |