diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-01-10 10:26:44 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-16 18:13:13 +0000 |
| commit | 6da1bb47a40fc37eb6d28e739afbb47383f0726d (patch) | |
| tree | 6d19bf8fcf700a37cde5140e2049f31901805201 /app | |
| parent | 0c12584ec6ee77ab8e593ea9cdef2e3d406b9753 (diff) | |
| download | gitlab-ce-6da1bb47a40fc37eb6d28e739afbb47383f0726d.tar.gz | |
Merge branch 'sh-fix-request-profiles-html' into 'master'
Fix requests profiler in admin page not rendering HTML properly
Closes #56152
See merge request gitlab-org/gitlab-ce!24291
(cherry picked from commit 59c0c173b471d50007442c95464df0cac0030fc6)
4ac4ba26 Fix requests profiler in admin page not rendering HTML properly
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/requests_profiles_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/requests_profiles_controller.rb b/app/controllers/admin/requests_profiles_controller.rb index 57f7d3e3951..89d4c4f18d9 100644 --- a/app/controllers/admin/requests_profiles_controller.rb +++ b/app/controllers/admin/requests_profiles_controller.rb @@ -11,7 +11,7 @@ class Admin::RequestsProfilesController < Admin::ApplicationController profile = Gitlab::RequestProfiler::Profile.find(clean_name) if profile - render html: profile.content + render html: profile.content.html_safe else redirect_to admin_requests_profiles_path, alert: 'Profile not found' end |