diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-30 15:12:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-30 15:12:30 +0300 |
| commit | 6d19e491d1257b6fbc74f4cf3a30ddb28deaeaf4 (patch) | |
| tree | e14c505a5e880c85161d8c5b17b23341b6c37a21 /lib/gitlab/middleware | |
| parent | ea0085de54590ffde24fee2ced286961a419410d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/middleware')
| -rw-r--r-- | lib/gitlab/middleware/speedscope.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/middleware/speedscope.rb b/lib/gitlab/middleware/speedscope.rb index 547aab9c797..74f334d9ab3 100644 --- a/lib/gitlab/middleware/speedscope.rb +++ b/lib/gitlab/middleware/speedscope.rb @@ -44,7 +44,7 @@ module Gitlab headers = { 'Content-Type' => 'text/html' } path = request.env['PATH_INFO'].sub('//', '/') - speedscope_url = ActionController::Base.helpers.asset_url('/-/speedscope/index.html') + speedscope_path = ::Gitlab::Utils.append_path(::Gitlab.config.gitlab.relative_url_root, '/-/speedscope/index.html') html = <<~HTML <!DOCTYPE html> @@ -64,7 +64,7 @@ module Gitlab var iframe = document.createElement('IFRAME'); iframe.setAttribute('id', 'speedscope-iframe'); document.body.appendChild(iframe); - var iframeUrl = '#{speedscope_url}#profileURL=' + objUrl + '&title=' + 'Flamegraph for #{CGI.escape(path)}'; + var iframeUrl = '#{speedscope_path}#profileURL=' + objUrl + '&title=' + 'Flamegraph for #{CGI.escape(path)}'; iframe.setAttribute('src', iframeUrl); </script> </body> |