Automatic merge of gitlab-org/gitlab-ce master

6fa9f078 · GitLab Bot · 50cf3a60 · 91572076 · 6fa9f078
Commit 6fa9f078 authored Jun 17, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spec/support/helpers/query_recorder.rb spec/support/helpers/query_recorder.rb +1 -1

No files found.
--- a/spec/support/helpers/query_recorder.rb
+++ b/spec/support/helpers/query_recorder.rb
@@ -11,7 +11,7 @@ module ActiveRecord

    def show_backtrace(values)
      Rails.logger.debug("QueryRecorder SQL: #{values[:sql]}")
-      caller.each { |line| Rails.logger.debug("   --> #{line}") }
+      Gitlab::Profiler.clean_backtrace(caller).each { |line| Rails.logger.debug("   --> #{line}") }
    end

    def callback(name, start, finish, message_id, values)