Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

2018-03-16 22:20:20 +01:00 · 2018-03-16 22:20:20 +01:00 · 55c45b15c4
commit 55c45b15c4
parent 46fed0810a 6a0784ab4f
1 changed files with 1 additions and 1 deletions
--- a/app/models/role.rb
+++ b/app/models/role.rb
@ -82,7 +82,7 @@ returns
 =end

  def self.signup_role_ids
-    Role.where(active: true, default_at_signup: true).map(&:id)
+    signup_roles.map(&:id)
  end

 =begin