Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/commit/_commit_box.html.haml

@@ -28,7 +28,7 @@
     = link_to project_tree_path(@project, @commit), class: "btn btn-default append-right-10 d-none d-sm-none d-md-inline" do
       #{ _('Browse files') }
     .dropdown.inline
-      %a.btn.btn-default.dropdown-toggle.qa-options-button{ data: { toggle: "dropdown" } }
+      %a.btn.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } }
         %span= _('Options')
         = icon('caret-down')
       %ul.dropdown-menu.dropdown-menu-right

changelogs/unreleased/62144-fix-option-dropdown-button-size.yml

+---
+title: Fix inconsistent option dropdown button height to match adjacent button
+merge_request: 29096
+author:
+type: fixed

changelogs/unreleased/sh-add-backtrace-to-sql-queries.yml

+---
+title: Add backtraces to Peek performance bar for SQL calls
+merge_request:
+author:
+type: added

lib/gitlab/performance_bar/peek_query_tracker.rb

@@ -27,15 +27,16 @@ module Gitlab
         subscribe('sql.active_record') do |_, start, finish, _, data|
           if Gitlab::SafeRequestStore.store[:peek_enabled]
             unless data[:cached]
-              track_query(data[:sql].strip, data[:binds], start, finish)
+              backtrace = Gitlab::Profiler.clean_backtrace(caller)
+              track_query(data[:sql].strip, data[:binds], backtrace, start, finish)
             end
           end
         end
       end
 
-      def track_query(raw_query, bindings, start, finish)
+      def track_query(raw_query, bindings, backtrace, start, finish)
         duration = (finish - start) * 1000.0
-        query_info = { duration: duration.round(3), sql: raw_query }
+        query_info = { duration: duration.round(3), sql: raw_query, backtrace: backtrace }
 
         PEEK_DB_CLIENT.query_details << query_info
       end