From 7f462b630a6c7476418e8c6301081e41b91c446c Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Thu, 16 Aug 2018 08:18:13 +0200 Subject: Rails5: Enable verbose query logs --- changelogs/unreleased/rails5-verbose-query-logs.yml | 5 +++++ config/initializers/active_record_verbose_query_logs.rb | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/rails5-verbose-query-logs.yml diff --git a/changelogs/unreleased/rails5-verbose-query-logs.yml b/changelogs/unreleased/rails5-verbose-query-logs.yml new file mode 100644 index 00000000000..c6d0ca9c841 --- /dev/null +++ b/changelogs/unreleased/rails5-verbose-query-logs.yml @@ -0,0 +1,5 @@ +--- +title: 'Rails5: Enable verbose query logs' +merge_request: 21231 +author: Jasper Maes +type: fixed 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 -- cgit v1.2.1