summaryrefslogtreecommitdiff
path: root/lib/api/helpers.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 /lib/api/helpers.rb
parentc218dd90dabb0ddff7fab09abbb348fe1c56201b (diff)
downloadgitlab-ce-5853c96b49010aaf33b85caeb94dfc18873d5656.tar.gz
remove Ability.abilities
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 1afca5fe2e8..fdb70af694d 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -148,7 +148,7 @@ module API
end
def can?(object, action, subject)
- abilities.allowed?(object, action, subject)
+ Ability.allowed?(object, action, subject)
end
# Checks the occurrences of required attributes, each attribute must be present in the params hash
@@ -408,10 +408,6 @@ module API
links.join(', ')
end
- def abilities
- Ability
- end
-
def secret_token
File.read(Gitlab.config.gitlab_shell.secret_file).chomp
end