diff options
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5f05337e59e..05f496c3b99 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -271,6 +271,7 @@ class ApplicationController < ActionController::Base headers['X-XSS-Protection'] = '1; mode=block' headers['X-UA-Compatible'] = 'IE=edge' headers['X-Content-Type-Options'] = 'nosniff' + headers[Gitlab::Metrics::RequestsRackMiddleware::FEATURE_CATEGORY_HEADER] = feature_category end def default_cache_headers @@ -465,7 +466,8 @@ class ApplicationController < ActionController::Base user: -> { auth_user if strong_memoized?(:auth_user) }, project: -> { @project if @project&.persisted? }, namespace: -> { @group if @group&.persisted? }, - caller_id: full_action_name) do + caller_id: caller_id, + feature_category: feature_category) do yield ensure @current_context = Labkit::Context.current.to_h @@ -484,7 +486,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) @@ -547,10 +549,14 @@ class ApplicationController < ActionController::Base end end - def full_action_name + def caller_id "#{self.class.name}##{action_name}" end + def feature_category + self.class.feature_category_for_action(action_name).to_s + end + def required_signup_info return unless current_user return unless current_user.role_required? |