Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added association not soft destroyed validator #389

Merged

Conversation

edwardmp
Copy link
Contributor

@edwardmp edwardmp commented Mar 7, 2017

See #380.

While we're at it I also included some changes so the following warning doesn't show up anymore:
Use assert_nil if expecting nil from [..]. This will fail in MT6.

@edwardmp edwardmp changed the title Added association not soft destroyed validator (see #380) Added association not soft destroyed validator Mar 7, 2017
@BenMorganIO
Copy link
Collaborator

Why the merge commit in e3eeb53?

@BenMorganIO
Copy link
Collaborator

Looks like 51f9541 occurred in #385, yet @jhawthorn hasn't rebased. So I'll take yours :)

@edwardmp
Copy link
Contributor Author

edwardmp commented Mar 7, 2017

@BenMorganIO because I first edited the README directly through GitHub, and then fixed the test warnings but forgot to pull first ;)

validates :parent_model, association_not_soft_destroyed: true
end


Copy link
Collaborator

@BenMorganIO BenMorganIO Mar 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra new line here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@BenMorganIO
Copy link
Collaborator

BenMorganIO commented Mar 8, 2017

@edwardmp awesome. Could you add this to the Changelog using the same format as in 2.2.1 and see if you can remove the merge commit? It's fine if you can't, they're tricky things merge commits.

Thanks for all your work on getting this guy in!!!

@edwardmp edwardmp force-pushed the AssociationNotSoftDestroyedValidator branch from e3eeb53 to fc16137 Compare March 8, 2017 00:05
@edwardmp
Copy link
Contributor Author

edwardmp commented Mar 8, 2017

@BenMorganIO all fixed!

@edwardmp edwardmp force-pushed the AssociationNotSoftDestroyedValidator branch 2 times, most recently from 5dd1ea1 to fbd117f Compare March 8, 2017 00:11
@edwardmp edwardmp force-pushed the AssociationNotSoftDestroyedValidator branch from fbd117f to d366099 Compare March 8, 2017 00:11
@BenMorganIO BenMorganIO merged commit 36adfec into rubysherpas:core Mar 8, 2017
@BenMorganIO
Copy link
Collaborator

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants