diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-01 13:37:03 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-01 13:37:03 -0500 |
| commit | 9f1c3bb7659365d09f2482d57621a3ff0510d9bf (patch) | |
| tree | 1bdde66b08c960e8447d9400f129477095fac2e2 /config | |
| parent | fefa6a6f9e8f484300a808f1db6254a502cef73a (diff) | |
| parent | 90ced487f2e8a6252864f9ac8821c2de06be9ced (diff) | |
| download | gitlab-ce-9f1c3bb7659365d09f2482d57621a3ff0510d9bf.tar.gz | |
Merge branch 'master' into improve-user-tabs
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 8 | ||||
| -rw-r--r-- | config/initializers/relative_url.rb.sample | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index b905f1a3e90..28684a3e578 100644 --- a/config/application.rb +++ b/config/application.rb @@ -54,14 +54,6 @@ module Gitlab config.action_view.sanitized_allowed_protocols = %w(smb) - # Relative URL support - # WARNING: We recommend using an FQDN to host GitLab in a root path instead - # of using a relative URL. - # Documentation: http://doc.gitlab.com/ce/install/relative_url.html - # Uncomment and customize the following line to run in a non-root path - # - # config.relative_url_root = "/gitlab" - config.middleware.use Rack::Attack # Allow access to GitLab API from other domains diff --git a/config/initializers/relative_url.rb.sample b/config/initializers/relative_url.rb.sample new file mode 100644 index 00000000000..125297d5385 --- /dev/null +++ b/config/initializers/relative_url.rb.sample @@ -0,0 +1,10 @@ +# Relative URL support +# WARNING: We recommend using an FQDN to host GitLab in a root path instead +# of using a relative URL. +# Documentation: http://doc.gitlab.com/ce/install/relative_url.html +# Copy this file to relative_url.rb and customize it to run in a non-root path +# + +Rails.application.configure do + config.relative_url_root = "/gitlab" +end |