Commit 294a9e98 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'

[Rails5] Update ar5_batching initializer

See merge request gitlab-org/gitlab-ce!17825
parents 9942364f c12bd5e8
# Port ActiveRecord::Relation#in_batches from ActiveRecord 5. # Remove this file when upgraded to rails 5.0.
# https://github.com/rails/rails/blob/ac027338e4a165273607dccee49a3d38bc836794/activerecord/lib/active_record/relation/batches.rb#L184 unless Gitlab.rails5?
# TODO: this can be removed once we're using AR5. module ActiveRecord
raise "Vendored ActiveRecord 5 code! Delete #{__FILE__}!" if ActiveRecord::VERSION::MAJOR >= 5
module ActiveRecord
module Batches module Batches
# Differences from upstream: enumerator support was removed, and custom # Differences from upstream: enumerator support was removed, and custom
# order/limit clauses are ignored without a warning. # order/limit clauses are ignored without a warning.
...@@ -39,4 +36,5 @@ module ActiveRecord ...@@ -39,4 +36,5 @@ module ActiveRecord
end end
end end
end 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