From ddb3e686ecbb027fc5238080a2bc12672bf43c8d Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Wed, 1 Jul 2015 18:37:25 -0300 Subject: [PATCH] fix wrong merge --- vendor/plugins/access_control/lib/acts_as_accessible.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/plugins/access_control/lib/acts_as_accessible.rb b/vendor/plugins/access_control/lib/acts_as_accessible.rb index 6b0a1db..4f3d77c 100644 --- a/vendor/plugins/access_control/lib/acts_as_accessible.rb +++ b/vendor/plugins/access_control/lib/acts_as_accessible.rb @@ -19,9 +19,9 @@ module ActsAsAccessible nil end - def affiliate(accessor, roles, attributes = {}) + def affiliate(accessor, roles) roles = [roles] unless roles.kind_of?(Array) - roles.map {|role| accessor.add_role(role, self, attributes)}.any? + roles.map {|role| accessor.add_role(role, self)}.any? end def disaffiliate(accessor, roles) -- libgit2 0.21.2