summaryrefslogtreecommitdiff
path: root/config/initializers/0_marginalia.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
commit05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch)
tree11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /config/initializers/0_marginalia.rb
parentec73467c23693d0db63a797d10194da9e72a74af (diff)
downloadgitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'config/initializers/0_marginalia.rb')
-rw-r--r--config/initializers/0_marginalia.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb
index c776747939f..e0e68ce7248 100644
--- a/config/initializers/0_marginalia.rb
+++ b/config/initializers/0_marginalia.rb
@@ -24,7 +24,12 @@ if Gitlab.dev_or_test_env?
Marginalia::Comment.components << :line
Marginalia::Comment.lines_to_ignore = Regexp.union(
Gitlab::BacktraceCleaner::IGNORE_BACKTRACES + %w[
- lib/ruby/gems/ lib/gem_extensions/ lib/ruby/ lib/gitlab/marginalia/ gems/
+ lib/ruby/gems/
+ lib/gem_extensions/
+ lib/ruby/
+ lib/gitlab/marginalia/
+ gems/
+ lib/gitlab/database/load_balancing/connection_proxy.rb
])
end