Merge branch 'rails5-verbose-query-logs' into 'master'

Rails5: Enable verbose query logs

See merge request gitlab-org/gitlab-ce!21231

changelogs/unreleased/rails5-verbose-query-logs.yml

@@ -0,0 +1,5 @@
+---
+title: 'Rails5: Enable verbose query logs'
+merge_request: 21231
+author: Jasper Maes
+type: other

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