aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2019-07-15 20:35:05 +0100
committerGitHub <noreply@github.com>2019-07-15 20:35:05 +0100
commit69cb9eb7adaf2ee1c33ee1dcf6aadd6eafa7b6d2 (patch)
tree61033890c41c15158f5dbce6668e7e14a0beacb2 /activerecord
parent998fa9b158d7b021dd6a7a96bca45b6abc115ba4 (diff)
parent07ff343857699f0806294539947cf485ff205a2b (diff)
downloadrails-69cb9eb7adaf2ee1c33ee1dcf6aadd6eafa7b6d2.tar.gz
rails-69cb9eb7adaf2ee1c33ee1dcf6aadd6eafa7b6d2.tar.bz2
rails-69cb9eb7adaf2ee1c33ee1dcf6aadd6eafa7b6d2.zip
Merge pull request #36640 from Edouard-chin/ec-uniq-validation-fix
Fix errors getting duplicated when passed validations options:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/models/ship.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/models/ship.rb b/activerecord/test/models/ship.rb
index 7973219a79..6bab7a1eb9 100644
--- a/activerecord/test/models/ship.rb
+++ b/activerecord/test/models/ship.rb
@@ -27,7 +27,8 @@ class ShipWithoutNestedAttributes < ActiveRecord::Base
has_many :prisoners, inverse_of: :ship, foreign_key: :ship_id
has_many :parts, class_name: "ShipPart", foreign_key: :ship_id
- validates :name, presence: true
+ validates :name, presence: true, if: -> { true }
+ validates :name, presence: true, if: -> { true }
end
class Prisoner < ActiveRecord::Base