Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

3 files changed, 0 insertions, 111 deletions

diff --git a/app/views/sherlock/queries/_backtrace.html.haml b/app/views/sherlock/queries/_backtrace.html.haml
deleted file mode 100644
index 425113ba325..00000000000
--- a/app/views/sherlock/queries/_backtrace.html.haml
+++ /dev/null
@@ -1,31 +0,0 @@
-.gl-mt-3
-  .card
-    .card-header
-      %strong
-        = t('sherlock.application_backtrace')
-    %ul.content-list
-      - @query.application_backtrace.each do |location|
-        %li
-          %strong
-            - if defined?(BetterErrors)
-              = link_to(location.path, BetterErrors.editor.url(location.path, location.line))
-            - else
-              = location.path
-          %small.light
-            = t('sherlock.line')
-            = location.line
-
-  .card
-    .card-header
-      %strong
-        = t('sherlock.full_backtrace')
-    %ul.content-list
-      - @query.backtrace.each do |location|
-        %li
-          - if location.application?
-            %strong= location.path
-          - else
-            = location.path
-          %small.light
-            = t('sherlock.line')
-            = location.line
diff --git a/app/views/sherlock/queries/_general.html.haml b/app/views/sherlock/queries/_general.html.haml
deleted file mode 100644
index a16314213c4..00000000000
--- a/app/views/sherlock/queries/_general.html.haml
+++ /dev/null
@@ -1,54 +0,0 @@
-.gl-mt-3
-  .card
-    .card-header
-      %strong
-        = t('sherlock.general')
-    %ul.content-list
-      %li
-        %span.light
-          #{t('sherlock.time')}:
-        %strong
-          = @query.duration.round(4)
-          = t('sherlock.milliseconds')
-      %li
-        - frame = @query.last_application_frame
-        %span.light
-          #{t('sherlock.origin')}:
-        %strong
-          - if defined?(BetterErrors)
-            = link_to(frame.path, BetterErrors.editor.url(frame.path, frame.line))
-          - else
-            = frame.path
-        %small.light
-          = t('sherlock.line')
-          = frame.line
-
-  .card
-    .card-header
-      .float-right
-        %button.js-clipboard-trigger.gl-button.btn.btn-default.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
-          = sprite_icon('copy-to-clipboard')
-        %pre.hidden
-          = @query.formatted_query
-      %strong
-        = t('sherlock.query')
-    %ul.content-list
-      %li
-        .code.js-syntax-highlight.sherlock-code
-          :preserve
-            #{highlight("#{@query.id}.sql", @query.formatted_query, language: 'sql')}
-
-  .card
-    .card-header
-      .float-right
-        %button.js-clipboard-trigger.gl-button.btn.btn-default.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
-          = sprite_icon('copy-to-clipboard')
-        %pre.hidden
-          = @query.explain
-      %strong
-        = t('sherlock.query_plan')
-    %ul.content-list
-      %li
-        .code.js-syntax-highlight.sherlock-code
-          %pre
-            %code= @query.explain
diff --git a/app/views/sherlock/queries/show.html.haml b/app/views/sherlock/queries/show.html.haml
deleted file mode 100644
index eea13d105d8..00000000000
--- a/app/views/sherlock/queries/show.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-- page_title t('sherlock.title'), t('sherlock.transaction'), t('sherlock.query')
-- header_title t('sherlock.title'), sherlock_transactions_path
-
-%ul.nav-links.nav.nav-tabs
-  %li.active
-    %a{ href: "#tab-general", data: { toggle: "tab" } }
-      = t('sherlock.general')
-  %li
-    %a{ href: "#tab-backtrace", data: { toggle: "tab" } }
-      = t('sherlock.backtrace')
-
-.row-content-block
-  .float-right
-    = link_to(sherlock_transaction_path(@transaction), class: 'btn gl-button btn-default') do
-      = sprite_icon('arrow-left')
-      = t('sherlock.transaction')
-  .oneline
-    = t('sherlock.query')
-    = @query.id
-
-.tab-content
-  .tab-pane.active#tab-general
-    = render(partial: 'general')
-
-  .tab-pane#tab-backtrace
-    = render(partial: 'backtrace')