diff options
| author | Jason Hollingsworth <jhworth.developer@gmail.com> | 2014-01-24 20:59:42 -0600 |
|---|---|---|
| committer | Jason Hollingsworth <jhworth.developer@gmail.com> | 2014-01-24 21:14:05 -0600 |
| commit | 39a2adf4f49981dda9ab3e0d6a23b74acccbe128 (patch) | |
| tree | 803c3f58e4fa305875ee9e3512b9e03e10cfb7eb /app/mailers/notify.rb | |
| parent | ced4a37a186601b37121c19523955b96767d9af5 (diff) | |
| download | gitlab-ce-39a2adf4f49981dda9ab3e0d6a23b74acccbe128.tar.gz | |
Fix broken test in spec/models/project_spec.rb
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
Diffstat (limited to 'app/mailers/notify.rb')
| -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 |