Commit ee0871cd authored by Robert Speicher's avatar Robert Speicher
Browse files

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

Rails5: Enable verbose query logs

See merge request gitlab-org/gitlab-ce!21231
title: 'Rails5: Enable verbose query logs'
merge_request: 21231
author: Jasper Maes
type: other
...@@ -47,7 +47,9 @@ def ignored_callstack(path) ...@@ -47,7 +47,9 @@ def ignored_callstack(path)
end end
end end
unless Gitlab.rails5? if Rails.version.start_with?("5.2")
raise "Remove this monkey patch: #{__FILE__}"
prepend(VerboseQueryLogs) unless Rails.env.production? prepend(VerboseQueryLogs) unless Rails.env.production?
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment