diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-01 12:36:50 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-01 12:36:50 +0200 |
| commit | e6aa1c5266d10fa13a481492f4a41eba3b5eb0c3 (patch) | |
| tree | bf1bd7d1be5b77bd189a5d52465596b39c9c18d8 /app/models/user.rb | |
| parent | db5244ab9054610ae13b44a0d508a339971bdcca (diff) | |
| parent | 433d8a10c1d1259a61e59a8368db08d7d6b58c62 (diff) | |
| download | gitlab-ce-e6aa1c5266d10fa13a481492f4a41eba3b5eb0c3.tar.gz | |
Merge branch 'master' into repository-page-ui-issues
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 ad3cfbc03e4..8f5958333d7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -460,16 +460,12 @@ class User < ActiveRecord::Base can?(:create_group, nil) end - def abilities - Ability.abilities - end - def can_select_namespace? several_namespaces? || admin end def can?(action, subject) - abilities.allowed?(self, action, subject) + Ability.allowed?(self, action, subject) end def first_name |