summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-06-17 07:56:11 +0000
committerSean McGivern <sean@gitlab.com>2019-06-17 07:56:11 +0000
commit915720762265538918bba2199fa8505bac0adba7 (patch)
treef76ce8398945c24d7fb31c3f0116396689a0bee0 /spec
parent7f54f045ddeca672981b6dadc63615e372e9a737 (diff)
parent3a90ecd2c23d18d5b783ac5828e77a798b55766e (diff)
downloadgitlab-ce-915720762265538918bba2199fa8505bac0adba7.tar.gz
Merge branch 'sh-clean-query-recorder-backtrace' into 'master'
Clean QueryRecorder backtrace See merge request gitlab-org/gitlab-ce!29724
Diffstat (limited to 'spec')
-rw-r--r--spec/support/helpers/query_recorder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers/query_recorder.rb b/spec/support/helpers/query_recorder.rb
index c4ae62b25e4..d45377267f3 100644
--- 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)