Commit 09ae0071 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' into 'master'

[Rails5] Update active_record_locking initializer

See merge request gitlab-org/gitlab-ce!17824
parents 4b6b68d0 5c3316c2
# rubocop:disable Lint/RescueException # rubocop:disable Lint/RescueException
# This patch fixes https://github.com/rails/rails/issues/26024 # Remove this entire initializer when we are at rails 5.0.
# TODO: Remove it when it's no longer necessary # This file fixes the bug (see below) which has been fixed in the upstream.
unless Gitlab.rails5?
# This patch fixes https://github.com/rails/rails/issues/26024
# TODO: Remove it when it's no longer necessary
module ActiveRecord module ActiveRecord
module Locking module Locking
module Optimistic module Optimistic
# We overwrite this method because we don't want to have default value # We overwrite this method because we don't want to have default value
...@@ -71,4 +74,5 @@ module ActiveRecord ...@@ -71,4 +74,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