summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-23 12:58:11 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-23 12:58:11 -0400
commitb71e5a17e9f03ce6387310cfdcc6eb94f8d021df (patch)
tree65f65f42f81de089ab0a9f5fe2bd8a3baabbeb79 /config/initializers
parent926a814641cddc6219e63c4ffb604b47af86c686 (diff)
downloadgitlab-ce-b71e5a17e9f03ce6387310cfdcc6eb94f8d021df.tar.gz
Add default_url_options initializer
Fixes #2266
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/8_default_url_options.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/config/initializers/8_default_url_options.rb b/config/initializers/8_default_url_options.rb
new file mode 100644
index 00000000000..8c1b56846d2
--- /dev/null
+++ b/config/initializers/8_default_url_options.rb
@@ -0,0 +1,13 @@
+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
+ }
+
+ 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
+end