diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-28 08:34:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-28 08:34:34 +0000 |
| commit | 8140c6828905345ea510b23ee09e53f01a74f97d (patch) | |
| tree | fb65a901dd5b0c331e162f819fafe963dc84ab56 /config | |
| parent | f0227d761fa24b7f0fdf0b5fecd6d52a6d991714 (diff) | |
| parent | e3d2304d6971c42436e711ccf70b8e4d5114f887 (diff) | |
| download | gitlab-ce-8140c6828905345ea510b23ee09e53f01a74f97d.tar.gz | |
Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/8_default_url_options.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/config/initializers/8_default_url_options.rb b/config/initializers/8_default_url_options.rb index 8c1b56846d2..8fd27b1d88e 100644 --- a/config/initializers/8_default_url_options.rb +++ b/config/initializers/8_default_url_options.rb @@ -1,13 +1,11 @@ -unless Rails.env.test? - default_url_options = { - host: Gitlab.config.gitlab.host, - protocol: Gitlab.config.gitlab.protocol, - script_name: Gitlab.config.gitlab.relative_url_root - } +default_url_options = { + host: Gitlab.config.gitlab.host, + protocol: Gitlab.config.gitlab.protocol, + script_name: Gitlab.config.gitlab.relative_url_root +} - unless Gitlab.config.gitlab_on_standard_port? - default_url_options[:port] = Gitlab.config.gitlab.port - end - - Rails.application.routes.default_url_options = default_url_options +unless Gitlab.config.gitlab_on_standard_port? + default_url_options[:port] = Gitlab.config.gitlab.port end + +Rails.application.routes.default_url_options = default_url_options |