summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authoramouhzi <hassan.amouhzi@gmail.com>2013-07-30 16:48:00 +0200
committerHassan Amouhzi <github@anezi.net>2013-08-15 21:25:09 +0200
commit39d8a64d255a80df1ed3194f88ac56486b027870 (patch)
tree17e1ce8ebde53f88aee03c473dd4493e815100ac /config/application.rb
parent55582047413c639a4843f52f9869fafc01bf6522 (diff)
downloadgitlab-ce-39d8a64d255a80df1ed3194f88ac56486b027870.tar.gz
Fixes grack authentification under relative_url_root
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430 Ref: https://github.com/gitlabhq/gitlabhq/pull/3204 Ref: https://github.com/gitlabhq/gitlabhq/issues/1228 Add Rails' variable in application.rb to support relative url This variable is used by assets compilation and other modules. Note that user needs to change application.rb too Restrict session cookie to the relative path if set. Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e Fix Update attachment_uploader.rb bug with relative URL See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace Fix Wall relative bug with attachement files (javascript)
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index d86fe561fa9..f3edca8c353 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -67,5 +67,9 @@ module Gitlab
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ # Uncomment this if you are using a subdirectory
+ # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
+ # config.relative_url_root = "/gitlab"
end
end