diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 18:08:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 18:08:16 +0300 |
| commit | fb73ca3398c2ac49a616ab553e117b0586089702 (patch) | |
| tree | c2f787ac97df38569c59cd0e967331ec1ead6d7e /lib/peek | |
| parent | b6b8f7dc871e73f29af55f06a773136a7242df57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/peek')
| -rw-r--r-- | lib/peek/views/active_record.rb | 2 | ||||
| -rw-r--r-- | lib/peek/views/redis_detailed.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/peek/views/active_record.rb b/lib/peek/views/active_record.rb index 1bb3ddb964a..ed3470f81f4 100644 --- a/lib/peek/views/active_record.rb +++ b/lib/peek/views/active_record.rb @@ -32,7 +32,7 @@ module Peek detail_store << { duration: finish - start, sql: data[:sql].strip, - backtrace: Gitlab::Profiler.clean_backtrace(caller) + backtrace: Gitlab::BacktraceCleaner.clean_backtrace(caller) } end end diff --git a/lib/peek/views/redis_detailed.rb b/lib/peek/views/redis_detailed.rb index 84041b6be73..14cabd62025 100644 --- a/lib/peek/views/redis_detailed.rb +++ b/lib/peek/views/redis_detailed.rb @@ -23,7 +23,7 @@ module Gitlab detail_store << { cmd: args.first, duration: duration, - backtrace: ::Gitlab::Profiler.clean_backtrace(caller) + backtrace: ::Gitlab::BacktraceCleaner.clean_backtrace(caller) } end |