diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 11:16:56 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 11:16:56 +0300 |
| commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
| tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /app/helpers | |
| parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/branches_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb index 601df5c18df..bfd23aa4e04 100644 --- a/app/helpers/branches_helper.rb +++ b/app/helpers/branches_helper.rb @@ -12,7 +12,7 @@ module BranchesHelper def can_push_branch?(project, branch_name) return false unless project.repository.branch_exists?(branch_name) - ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(branch_name) + ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(branch_name) end def project_branches |