search

rails / protected_attributes

Protect attributes from mass-assignment in ActiveRecord models.
MIT License
228 stars 92 forks source link

Merge latest `master` into `integrate_with_strong_params` branch to #51

Closed ur5us closed 9 years ago

ur5us commented 9 years ago
  1. resolve (automatic) merge conflicts
  2. make all tests pass. The problem only existed in this branch and was fixed by @rafaelfranca in commit 57fa9b40

With that all tests should pass and thus the branch should be ready for merging into master for the next release.

hisenb3rg commented 9 years ago

@rafaelfranca Hey guys, any luck with this? This one would come really handy! Anything I can do to help?

ur5us commented 9 years ago

As master changed again I'll rebase @senny branch against the latest master and create a new PR.