diff options
| author | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
|---|---|---|
| committer | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
| commit | 58f29d5f855ea2e1411b99804a74710483a13f90 (patch) | |
| tree | 0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /lib/peek/rblineprof/custom_controller_helpers.rb | |
| parent | 0572da24c990fc01d88acfbd32728221e3e3a711 (diff) | |
| parent | a9827357186e38e5732d8dae23d9d02b1f4c7218 (diff) | |
| download | gitlab-ce-48746-fix-files-uploaded-in-base64.tar.gz | |
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'lib/peek/rblineprof/custom_controller_helpers.rb')
| -rw-r--r-- | lib/peek/rblineprof/custom_controller_helpers.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/peek/rblineprof/custom_controller_helpers.rb b/lib/peek/rblineprof/custom_controller_helpers.rb index 9beb442bfa3..581cc6a37b4 100644 --- a/lib/peek/rblineprof/custom_controller_helpers.rb +++ b/lib/peek/rblineprof/custom_controller_helpers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Peek module Rblineprof module CustomControllerHelpers @@ -41,7 +43,7 @@ module Peek ] end.sort_by{ |a,b,c,d,e,f| -f } - output = "<div class='modal-dialog modal-xl'><div class='modal-content'>" + output = ["<div class='modal-dialog modal-xl'><div class='modal-content'>"] output << "<div class='modal-header'>" output << "<h4>Line profiling: #{human_description(params[:lineprofiler])}</h4>" output << "<button class='close' type='button' data-dismiss='modal' aria-label='close'><span aria-hidden='true'>×</span></button>" @@ -93,7 +95,7 @@ module Peek output << "</div></div></div>" - response.body += "<div class='modal' id='modal-peek-line-profile' tabindex=-1>#{output}</div>".html_safe + response.body += "<div class='modal' id='modal-peek-line-profile' tabindex=-1>#{output.join}</div>".html_safe end ret |