gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2374 from openSUSE/depfu/update/shoulda-matchers-4.0.1

Browse source 
Update shoulda-matchers: 3.1.2 → 4.0.1 (major)
This commit is contained in:
Ana María Martínez Gómez 2019-06-03 09:23:52 +02:00 • committed by GitHub
commit 47ce659a2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -526,8 +526,8 @@ GEM
rubyzip (~> 1.2, >= 1.2.2) rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.11.0) sexp_processor (4.11.0)
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (3.1.2) shoulda-matchers (4.0.1)
activesupport (>= 4.0.0) activesupport (>= 4.2.0)
simplecov (0.16.1) simplecov (0.16.1)
docile (~> 1.1) docile (~> 1.1)
json (>= 1.8, < 3) json (>= 1.8, < 3)

2
app/models/registration.rb
View file

@ -31,7 +31,7 @@ class Registration < ApplicationRecord
validate :registration_to_events_only_if_present validate :registration_to_events_only_if_present
validates :accepted_code_of_conduct, acceptance: { validates :accepted_code_of_conduct, acceptance: {
if: -> { conference.code_of_conduct.present? } if: -> { conference.try(:code_of_conduct).present? }
} }
after_create :set_week, :subscribe_to_conference, :send_registration_mail after_create :set_week, :subscribe_to_conference, :send_registration_mail