kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Douwe Maan 2018-12-27 15:46:32 +01:00
parent 77909a8846
commit fd27be9348
No known key found for this signature in database
GPG Key ID: 5976703F65143D36
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/active_record_avoid_type_casting_in_uniqueness_validator.rb
View File

@ -20,7 +20,7 @@
#
# 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__}"
end

7
config/initializers/active_record_locking.rb
View File

@ -1,7 +1,10 @@
# rubocop:disable Lint/RescueException
# Remove this monkey-patch when all lock_version values are converted from NULLs to zeros.
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/25228
# 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.
if Rails.gem_version >= Gem::Version.new("5.1")
raise "Remove this monkey patch: #{__FILE__}"
end
module ActiveRecord
module Locking
module Optimistic