Merge branch 'fix-speedscope-cors' into 'master'

Fix Speedscope flamegraphs when asset host is set See merge request gitlab-org/gitlab!60680

Merge branch 'fix-speedscope-cors' into 'master'
Fix Speedscope flamegraphs when asset host is set See merge request gitlab-org/gitlab!60680
7fc69431 · Matthias Käppler · de3c878d · 34a847aa · 7fc69431
Commit 7fc69431 authored Apr 30, 2021 by Matthias Käppler
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lib/gitlab/middleware/speedscope.rb lib/gitlab/middleware/speedscope.rb +2 -2

No files found.
--- 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>