aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-06-08 11:35:13 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-06-08 11:35:13 -0700
commit41d63710f22065c16582125873a4e3c14357bd7f (patch)
tree92cd96eaa972b4abb02501398e6245f1060b6b0f /activemodel/lib/active_model
parentd1136e6ad0aab44cfc0626c553b3ee82479f6196 (diff)
parent00ff0a6776aca4977dc6eab5ec130c67e36c36ac (diff)
downloadrails-41d63710f22065c16582125873a4e3c14357bd7f.tar.gz
rails-41d63710f22065c16582125873a4e3c14357bd7f.tar.bz2
rails-41d63710f22065c16582125873a4e3c14357bd7f.zip
Merge pull request #6668 from pomnikita/master
Compact array of values added to PermissionSet instance
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/mass_assignment_security/permission_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
index 9661349503..415ab0ad17 100644
--- a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
+++ b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
@@ -5,7 +5,7 @@ module ActiveModel
class PermissionSet < Set
def +(values)
- super(values.map(&:to_s))
+ super(values.compact.map(&:to_s))
end
def include?(key)