diff options
| author | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
|---|---|---|
| committer | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
| commit | 4c7da578f200f0bc721cc2cae27eb2b25f96e8dd (patch) | |
| tree | 565b5b7746bc2cff8e46883b4d1836dfaa0246ef /lib/api/helpers.rb | |
| parent | 76594d474ca6d04c2e608e7b3df1229729288f14 (diff) | |
| parent | 928178deb9d582d7537a57983ff9e695f07dab1f (diff) | |
| download | gitlab-ce-4c7da578f200f0bc721cc2cae27eb2b25f96e8dd.tar.gz | |
Merge branch 'master' into buildbox-service
Conflicts:
app/models/project.rb
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 3a619169eca..3262884f6d3 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -71,7 +71,7 @@ module API forbidden! unless current_user.is_admin? end - def authorize! action, subject + def authorize!(action, subject) unless abilities.allowed?(current_user, action, subject) forbidden! end |