summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-22 18:09:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-22 18:09:54 +0000
commit3bb41f7bdd2a94887af92fc33e8afac1032f0fbc (patch)
treeb4feed3b050d8fc930dc4ea747409965a71d4952 /app/controllers/application_controller.rb
parenteb08c8e6f8a49d5a621be0301aad0b1b475eb739 (diff)
downloadgitlab-ce-3bb41f7bdd2a94887af92fc33e8afac1032f0fbc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5f05337e59e..e71652faa27 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -484,7 +484,7 @@ class ApplicationController < ActionController::Base
def set_page_title_header
# Per https://tools.ietf.org/html/rfc5987, headers need to be ISO-8859-1, not UTF-8
- response.headers['Page-Title'] = URI.escape(page_title('GitLab'))
+ response.headers['Page-Title'] = Addressable::URI.encode_component(page_title('GitLab'))
end
def set_current_admin(&block)