diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
| commit | 6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (patch) | |
| tree | 883e9db60c047c54418fc1d2b1c5517f97e0f185 /lib/gitlab/query_limiting/middleware.rb | |
| parent | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/query_limiting/middleware.rb')
| -rw-r--r-- | lib/gitlab/query_limiting/middleware.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/query_limiting/middleware.rb b/lib/gitlab/query_limiting/middleware.rb index f6ffbfe2645..714fe42884a 100644 --- a/lib/gitlab/query_limiting/middleware.rb +++ b/lib/gitlab/query_limiting/middleware.rb @@ -37,10 +37,10 @@ module Gitlab controller = env[CONTROLLER_KEY] action = "#{controller.class.name}##{controller.action_name}" - if controller.content_type == 'text/html' + if controller.media_type == 'text/html' action else - "#{action} (#{controller.content_type})" + "#{action} (#{controller.media_type})" end end |