Make it clear that monkey patch is no longer needed in Rails 5.1

parent 77909a88
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# #
# This bug was fixed in Rails 5.1 by https://github.com/rails/rails/pull/24745/commits/aa062318c451512035c10898a1af95943b1a3803 # This bug was fixed in Rails 5.1 by https://github.com/rails/rails/pull/24745/commits/aa062318c451512035c10898a1af95943b1a3803
if Rails.version.start_with?("5.1") if Rails.gem_version >= Gem::Version.new("5.1")
raise "Remove this monkey patch: #{__FILE__}" raise "Remove this monkey patch: #{__FILE__}"
end end
......
# rubocop:disable Lint/RescueException # rubocop:disable Lint/RescueException
# Remove this monkey-patch when all lock_version values are converted from NULLs to zeros. # Remove this monkey patch when we move to Rails 5.1, because the bug has been fixed in https://github.com/rails/rails/pull/26050.
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/25228 if Rails.gem_version >= Gem::Version.new("5.1")
raise "Remove this monkey patch: #{__FILE__}"
end
module ActiveRecord module ActiveRecord
module Locking module Locking
module Optimistic module Optimistic
......
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