diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /app/models/role.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/role.rb')
| -rw-r--r-- | app/models/role.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/role.rb b/app/models/role.rb index 10977612d..efd9a334d 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -166,7 +166,7 @@ class Role < ActiveRecord::Base # Find all the roles that can be given to a project member def self.find_all_givable - Role.givable.all + Role.givable.to_a end # Return the builtin 'non member' role. If the role doesn't exist, |