diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-27 11:15:57 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-28 16:33:30 +0200 |
| commit | 60797a42b419841e14f50f85bf8daa2a115a72f9 (patch) | |
| tree | 930ea47354df7c2e415cf77dbb727967da97296a /config | |
| parent | 48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff) | |
| download | gitlab-ce-60797a42b419841e14f50f85bf8daa2a115a72f9.tar.gz | |
Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 02d3161f769..63f4c8c9e0a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -223,7 +223,7 @@ Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_c Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? -Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 +Settings.gitlab['port'] ||= ENV['GITLAB_PORT'] || (Settings.gitlab.https ? 443 : 80) Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil? |