diff options
Diffstat (limited to 'config/initializers/0_marginalia.rb')
| -rw-r--r-- | config/initializers/0_marginalia.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb index 805a9e33347..e88599fd93c 100644 --- a/config/initializers/0_marginalia.rb +++ b/config/initializers/0_marginalia.rb @@ -17,11 +17,14 @@ Marginalia::Comment.components = [:application, :correlation_id, :jid, :endpoint # As mentioned in https://github.com/basecamp/marginalia/pull/93/files, # adding :line has some overhead because a regexp on the backtrace has -# to be run on every SQL query. Only enable this in development because +# to be run on every SQL query. Only enable this in development and test because # we've seen it slow things down. -if Rails.env.development? +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/)) + Marginalia::Comment.lines_to_ignore = Regexp.union( + Gitlab::BacktraceCleaner::IGNORE_BACKTRACES + %w[ + lib/ruby/gems/ lib/gem_extensions/ lib/ruby/ lib/gitlab/marginalia/ gems/ + ]) end Gitlab::Marginalia.set_application_name |