diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 15:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 15:08:58 +0300 |
| commit | c9ca178ba4c9a3e48d9d069f7d7486a29827cc61 (patch) | |
| tree | 07a4f84921b80ff967d30229f0d887c152b9b1d8 /lib/gitlab/marginalia | |
| parent | 6035fcc36ead3b415fa2422b0204a795a70f3e2f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/marginalia')
| -rw-r--r-- | lib/gitlab/marginalia/active_record_instrumentation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/marginalia/active_record_instrumentation.rb b/lib/gitlab/marginalia/active_record_instrumentation.rb index 3266b9f8336..452f472bf6a 100644 --- a/lib/gitlab/marginalia/active_record_instrumentation.rb +++ b/lib/gitlab/marginalia/active_record_instrumentation.rb @@ -5,7 +5,7 @@ module Gitlab module Marginalia module ActiveRecordInstrumentation def annotate_sql(sql) - Gitlab::Marginalia.cached_feature_enabled? ? super(sql) : sql + Gitlab::Marginalia.enabled ? super(sql) : sql end end end |