diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-03-06 15:20:27 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-06 15:20:27 +0300 |
| commit | e371520f465a9f92794d5820faf5c21a893dd77e (patch) | |
| tree | 252e239251b8000dc7d5a80a3fd6baa46dcad213 /app/views | |
| parent | e94c13d39d691983864e3b99434de19681d22783 (diff) | |
Allow protected branch creation via web and API
This commit includes changes to add `UserAccess#can_create_branch?`
which will check whether the user is allowed to create a branch even
if it matches a protected branch.
This is used in `Gitlab::Checks::BranchCheck` when the branch name
matches a protected branch.
A `push_to_create_protected_branch` ability in `ProjectPolicy` has been
added to allow Developers and above to create protected branches.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/protected_branches/shared/_index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/protected_branches/shared/_index.html.haml b/app/views/projects/protected_branches/shared/_index.html.haml index 539b184e5c2..4997770321e 100644 --- a/app/views/projects/protected_branches/shared/_index.html.haml +++ b/app/views/projects/protected_branches/shared/_index.html.haml @@ -12,7 +12,7 @@ %p By default, protected branches are designed to: %ul - %li prevent their creation, if not already created, from everybody except Maintainers + %li prevent their creation, if not already created, from everybody except users who are allowed to merge %li prevent pushes from everybody except Maintainers %li prevent <strong>anyone</strong> from force pushing to the branch %li prevent <strong>anyone</strong> from deleting the branch |