diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-22 12:25:07 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-22 12:25:07 +0200 |
| commit | 416018062131e048fd5e97a3d399bb20e771e965 (patch) | |
| tree | 5e56cd4ec61eb96cdec1d177d7dc290585e1c14e /app/views/projects/protected_branches | |
| parent | b43e918a73c88a8d922c5c5d79e2aa2bf42a9d29 (diff) | |
| download | gitlab-ce-416018062131e048fd5e97a3d399bb20e771e965.tar.gz | |
Improve the wording explaining protected branches.
Diffstat (limited to 'app/views/projects/protected_branches')
| -rw-r--r-- | app/views/projects/protected_branches/index.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 7925e800305..3980a6c0863 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -1,14 +1,14 @@ %h3.page-title Protected branches -%p.light This ability allows to keep stable branches secured and force code review before merge to protected branches +%p.light This ability keeps stable branches secure and forces developers to use code reviews %hr .bs-callout.bs-callout-info - %p Protected branches designed to + %p Protected branches are designed to %ul - %li prevent push for all except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"} - %li prevent branch from force push - %li prevent branch from removal - %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "underlined-link"} + %li prevent pushes from everybody except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"} + %li prevents anyone from force pushing to the branch + %li prevents anyone from deleting the branch + %p Read more about #{link_to "project permissions", help_page_path("permissions", "permissions"), class: "underlined-link"} - if can? current_user, :admin_project, @project = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f| |