diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-17 01:44:16 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-17 01:44:16 +0300 |
| commit | 46494f46a1345bafed1cde91ccfa4fb585a1782f (patch) | |
| tree | 0f63e566fa576644595fcd9b5105f415c1d534d5 /config | |
| parent | fdda36b7b70be6eaa511ee92fe9aa377d5eb4407 (diff) | |
| parent | a0b92642e3068e65f51b3b3d4daba14d9e0aa8d4 (diff) | |
Merge branch 'rails5-verbose-query-logs' into 'master'
Rails5: Enable verbose query logs
See merge request gitlab-org/gitlab-ce!21231
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/active_record_verbose_query_logs.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/active_record_verbose_query_logs.rb b/config/initializers/active_record_verbose_query_logs.rb index 44f86fec7e0..1c5fbc8e830 100644 --- a/config/initializers/active_record_verbose_query_logs.rb +++ b/config/initializers/active_record_verbose_query_logs.rb @@ -47,7 +47,9 @@ module ActiveRecord end end - unless Gitlab.rails5? + if Rails.version.start_with?("5.2") + raise "Remove this monkey patch: #{__FILE__}" + else prepend(VerboseQueryLogs) unless Rails.env.production? end end |