diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 12:10:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 12:10:46 +0300 |
| commit | 2e9f877e8b6dd58c8011745b1d9a28dd67c8179c (patch) | |
| tree | 0e2d42aa2ef1c3ae386b54962815623466a3dd54 /lib/gitlab/marginalia | |
| parent | c86c0e01469fd7c9aa72283db23d539c02f44bdb (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 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/gitlab/marginalia/active_record_instrumentation.rb b/lib/gitlab/marginalia/active_record_instrumentation.rb deleted file mode 100644 index 452f472bf6a..00000000000 --- a/lib/gitlab/marginalia/active_record_instrumentation.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -# Patch to annotate sql only when the feature is enabled. -module Gitlab - module Marginalia - module ActiveRecordInstrumentation - def annotate_sql(sql) - Gitlab::Marginalia.enabled ? super(sql) : sql - end - end - end -end |