diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-22 09:24:46 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-22 09:24:46 +0000 |
| commit | 40753f307ef6501302fceb26220fa541c273d7c7 (patch) | |
| tree | 712a561419bf69f5394387961ce3e9ec1f342714 /app | |
| parent | 50124864e389e6813296cc803efac76f7c23b633 (diff) | |
| parent | b48fd097ff22965bbb8d89780bc2a35385ffdfb5 (diff) | |
| download | gitlab-ce-40753f307ef6501302fceb26220fa541c273d7c7.tar.gz | |
Merge branch 'doc-protected-branches' into 'master'
Refactor protected branches documentation
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19832
See merge request !5419
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/protected_branches/index.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 151e1d64851..950df740bbc 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -6,12 +6,13 @@ = page_title %p Keep stable branches secure and force developers to use merge requests. %p.prepend-top-20 - Protected branches are designed to: + By default, protected branches are designed to: %ul - %li prevent pushes from everybody except #{link_to "masters", help_page_path("user/permissions"), class: "vlink"} - %li prevent anyone from force pushing to the branch - %li prevent anyone from deleting the branch - %p.append-bottom-0 Read more about #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"} + %li prevent their creation, if not already created, from everybody except Masters + %li prevent pushes from everybody except Masters + %li prevent <strong>anyone</strong> from force pushing to the branch + %li prevent <strong>anyone</strong> from deleting the branch + %p.append-bottom-0 Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches"), class: "underlined-link"} and #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"}. .col-lg-9 %h5.prepend-top-0 Protect a branch @@ -23,7 +24,7 @@ = f.label :name, "Branch", class: "label-light" = render partial: "dropdown", locals: { f: f } %p.help-block - = link_to "Wildcards", help_page_path('workflow/protected_branches', anchor: "wildcard-protected-branches") + = link_to "Wildcards", help_page_path('user/project/protected_branches', anchor: "wildcard-protected-branches") such as %code *-stable or |