diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-24 18:41:06 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-24 18:41:06 +0100 |
| commit | b70cee9c2fde878d77b1540c31e7560ea9f97460 (patch) | |
| tree | 20b1b9b350e26e9a9ce91722e0a46c7d1a92aaef /lib/api/internal.rb | |
| parent | 8a0abbb7578addc52d4d269b2b319280d2e37823 (diff) | |
| parent | ef944e83ec8c439350df03c3bb9b5bbb3f68f406 (diff) | |
| download | gitlab-ce-b70cee9c2fde878d77b1540c31e7560ea9f97460.tar.gz | |
Merge branch 'git_hook_messages_ce' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
GITLAB_SHELL_VERSION
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index ebf2296097d..1648834f034 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -43,7 +43,7 @@ module API return false unless actor - access.allowed?( + access.check( actor, params[:action], project, |