diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 19:18:09 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 19:46:04 -0400 |
| commit | aa9435cddbe57841b4572e05fb4e7756f8b47405 (patch) | |
| tree | 8b456eabdb38ffa2bd4bdecfdfec5a776135a417 /app/controllers | |
| parent | 439b9f50af3168d33169a4cd25b59e45ea46dc62 (diff) | |
| download | gitlab-ce-aa9435cddbe57841b4572e05fb4e7756f8b47405.tar.gz | |
Remove duplicate settings for default_url_options
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cfe2c76265c..69fd7901832 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -182,18 +182,6 @@ class ApplicationController < ActionController::Base response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT" end - def default_url_options - if !Rails.env.test? - port = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port? - { host: Gitlab.config.gitlab.host, - protocol: Gitlab.config.gitlab.protocol, - port: port, - script_name: Gitlab.config.gitlab.relative_url_root } - else - super - end - end - def default_headers headers['X-Frame-Options'] = 'DENY' headers['X-XSS-Protection'] = '1; mode=block' |