diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-15 13:16:03 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-15 13:16:03 +0300 |
| commit | a632ed69739c672da8fafff2fe64f37a9c3e4405 (patch) | |
| tree | 72ce4dc9962014e7b04d941664b472441483d5d6 /lib | |
| parent | edfb9c78676dc2a47d3a2c8e3fd2d3f1ec3f698d (diff) | |
| parent | 2f06027dc318bd8c4e177444a3168a0129a53687 (diff) | |
Merge branch 'change-access-update' into 'master'
Change the order of the access rules to check simpler first, and add specs
See merge request !5799
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/checks/change_access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb index 52f117e963b..4b32eb966aa 100644 --- a/lib/gitlab/checks/change_access.rb +++ b/lib/gitlab/checks/change_access.rb @@ -11,7 +11,7 @@ module Gitlab end def exec - error = protected_branch_checks || tag_checks || push_checks + error = push_checks || tag_checks || protected_branch_checks if error GitAccessStatus.new(false, error) |