diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-03 16:44:59 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-03 16:44:59 +0000 |
| commit | 006659e74581a530716c9e633c356c468f5cafd2 (patch) | |
| tree | da187af79d41c7ba38b892c41a1615cc60abacb6 /app/controllers/admin | |
| parent | 2859e8d54f948184ac489afea995c65ed0ca325c (diff) | |
| parent | 1bb4ad9262efde3b7aefddf849480a102763a68f (diff) | |
| download | gitlab-ce-006659e74581a530716c9e633c356c468f5cafd2.tar.gz | |
Merge branch 'render-text-deprecated' into 'master'
Fix deprecation: render :text is deprecated because it does not actually render…
See merge request gitlab-org/gitlab-ce!23425
Diffstat (limited to 'app/controllers/admin')
| -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 64d74ae4231..57f7d3e3951 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 text: profile.content + render html: profile.content else redirect_to admin_requests_profiles_path, alert: 'Profile not found' end |