From d0356412dfc91d02585f0a177c65677dbe2944a3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 1 Feb 2020 03:09:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/backtrace_silencers.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/initializers') diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 58941aae1b0..f25bb7d25fa 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,2 +1,8 @@ Rails.backtrace_cleaner.remove_silencers! + +# This allows us to see the proper caller of SQL calls in {development,test}.log +if (Rails.env.development? || Rails.env.test?) && Gitlab.ee? + Rails.backtrace_cleaner.add_silencer { |line| line =~ %r(^ee/lib/gitlab/database/load_balancing) } +end + Rails.backtrace_cleaner.add_silencer { |line| line !~ Gitlab::APP_DIRS_PATTERN } -- cgit v1.2.3