Commit d77dc584 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'avoid-loading-protected-branches-on-change-access-checks' into 'master'

Avoid protected branches checks when verifying access without branch name

See merge request !6317
parents 8e13aa14 08871cc3
......@@ -115,6 +115,7 @@ v 8.12.0 (unreleased)
- Avoid conflict with admin labels when importing GitHub labels
- User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
- Fix repository page ui issues
- Avoid protected branches checks when verifying access without branch name
- Add information about user and manual build start to runner as variables !6201 (Sergey Gnuskov)
- Fixed invisible scroll controls on build page on iPhone
- Fix error on raw build trace download for old builds stored in database !4822
......
......@@ -23,6 +23,7 @@ module Gitlab
protected
def protected_branch_checks
return unless @branch_name
return unless project.protected_branch?(@branch_name)
if forced_push? && user_access.cannot_do_action?(:force_push_code_to_protected_branches)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment