diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
| commit | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (patch) | |
| tree | da09375c00d7931656cc790f053adf904d50c01e /app/models/user.rb | |
| parent | 57471894819c07796d2aa04e5a21d1a648a7751e (diff) | |
| parent | 8388bbe82918d2fca2600620f48e048ccfab2c97 (diff) | |
| download | gitlab-ce-8146271d4043a91e8f65c7af41c6c015e7d155c3.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences
Conflicts:
CHANGELOG
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 42faea0070e..154cc0f3e16 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -330,11 +330,7 @@ class User < ActiveRecord::Base end def abilities - @abilities ||= begin - abilities = Six.new - abilities << Ability - abilities - end + Ability.abilities end def can_select_namespace? |