Commit 7ddd6d28 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch 'puma-support-blank-relative-url-root' into 'master'

Support blank string for RAILS_RELATIVE_URL_ROOT

See merge request gitlab-org/gitlab!65974
parents b3877915 6b5ef73b
...@@ -13,7 +13,7 @@ warmup do |app| ...@@ -13,7 +13,7 @@ warmup do |app|
client.get('/') client.get('/')
end end
map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do map ENV['RAILS_RELATIVE_URL_ROOT'].presence || "/" do
use Gitlab::Middleware::ReleaseEnv use Gitlab::Middleware::ReleaseEnv
run Gitlab::Application run Gitlab::Application
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment