Merge branch 'rs-issue-2269' into 'master'

Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797

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