diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 06:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-01 06:09:04 +0300 |
| commit | d0356412dfc91d02585f0a177c65677dbe2944a3 (patch) | |
| tree | 5a2ac806b6ea6113475bb2a759f6b15c186fb482 /config/initializers | |
| parent | 72817fd7c07d1b812623f8d5e27fc7bcecb4eed5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/backtrace_silencers.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 } |