diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 09:06:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 09:06:11 +0000 |
| commit | e567b4c2df7dc4085d213db029eff6b6fcde0152 (patch) | |
| tree | 801718b86d32bdd82a3cd90760e06a4d7a51b71d /app | |
| parent | 42b933efc3384386c1991daca1a6d58160f70176 (diff) | |
| download | gitlab-ce-e567b4c2df7dc4085d213db029eff6b6fcde0152.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/protected_branch.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index 8769d3eb916..1857a59e01c 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -40,6 +40,11 @@ class ProtectedBranch < ApplicationRecord def self.protected_refs(project) project.protected_branches.select(:name) end + + def self.branch_requires_code_owner_approval?(project, branch_name) + # NOOP + # + end end ProtectedBranch.prepend_if_ee('EE::ProtectedBranch') |