summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2016-08-08 11:55:13 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2016-08-30 11:35:06 -0700
commit5853c96b49010aaf33b85caeb94dfc18873d5656 (patch)
treec685956bbc4cb007e72c8548a0b4000df1bc4948 /app/models/user.rb
parentc218dd90dabb0ddff7fab09abbb348fe1c56201b (diff)
downloadgitlab-ce-5853c96b49010aaf33b85caeb94dfc18873d5656.tar.gz
remove Ability.abilities
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb6
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