summaryrefslogtreecommitdiff
path: root/config.ru
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 09:08:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 09:08:43 +0000
commitf5f1f221ba08228dbbdd7080509028a7cac2fce2 (patch)
tree7a95ad0d16829f719c429276a8ed4ddaa097392a /config.ru
parent1ad2f1981f05721d92d04c490cfc0f234737fec1 (diff)
downloadgitlab-ce-f5f1f221ba08228dbbdd7080509028a7cac2fce2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.ru b/config.ru
index ed76239ef2e..e9964ddc96e 100644
--- a/config.ru
+++ b/config.ru
@@ -13,7 +13,7 @@ warmup do |app|
client.get('/')
end
-map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do
+map ENV['RAILS_RELATIVE_URL_ROOT'].presence || "/" do
use Gitlab::Middleware::ReleaseEnv
run Gitlab::Application
end