references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/10.3' into dev

Browse Source
This commit is contained in:
Henriette Dinger
2020-01-28 13:47:48 +01:00
parent 9b17386cd9 9b01830c24
commit 7efa45563c
69 changed files with 478 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.ru
+1 -8
View File
@@ -48,14 +48,7 @@ if defined?(Unicorn) && Rails.env.production?
use Unicorn::WorkerKiller::MaxRequests, min_req, max_req
end
##
# Returns true if the application should be run under a subdirectory.
def map_subdir?
# Don't map subdir when using Passenger as passenger takes care of that.
!defined?(::PhusionPassenger)
end
subdir = map_subdir? && OpenProject::Configuration.rails_relative_url_root.presence
subdir = OpenProject::Configuration.rails_relative_url_root.presence
map (subdir || '/') do
use Rack::Protection::JsonCsrf