Automatic merge of gitlab-org/gitlab-ce master

spec/support/helpers/query_recorder.rb

@@ -8,7 +8,10 @@ module ActiveRecord
       @log = []
       @cached = []
       @skip_cached = skip_cached
-      ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
+      # force replacement of bind parameters to give tests the ability to check for ids
+      ActiveRecord::Base.connection.unprepared_statement do
+        ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
+      end
     end
 
     def show_backtrace(values)