summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-22 18:31:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-22 18:31:22 +0300
commitb9d1fc2f3bdebe541795d6ef6e94da9e98b043d3 (patch)
tree4b14272cde781bf0c9c3359965992c6f34d32e52
parent36cac35b24d7b8318de40bd2e495b8807eef48fc (diff)
downloadgitlab-ce-b9d1fc2f3bdebe541795d6ef6e94da9e98b043d3.tar.gz
Improve protected branch explanation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/protected_branches/index.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 4a6e8943a9f..e9f67b671bf 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -4,12 +4,12 @@
= render "projects/branches/filter"
.col-md-9
.bs-callout.bs-callout-info
- %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
- %p This ability allows:
+ %p Protected branches designed to
%ul
- %li keep stable branches secured
- %li forced code review before merge to protected branches
- %li prevents branch from force push
+ %li prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
+ %li prevent branch from force push
+ %li prevent branch from removal
+ %p This ability allows to keep stable branches secured and force code review before merge to protected branches
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
- if can? current_user, :admin_project, @project