Download as
Browse Code »

Commit 8cc5e85543b0a553536ebe70f01fa29e0b0f60bd

Authored by Dmitriy Zaporozhets
1 parent 53504928
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Mention protected branch force push 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 2 additions and 0 deletions   Show diff stats
@@ -7,6 +7,7 @@ v 6.8.0 @@ -7,6 +7,7 @@ v 6.8.0
7 - Make the repository downloads path configurable 7 - Make the repository downloads path configurable
8 - Create branches via API (sponsored by O'Reilly Media) 8 - Create branches via API (sponsored by O'Reilly Media)
9 - Changed permission of gitlab-satellites directory not to be world accessible 9 - Changed permission of gitlab-satellites directory not to be world accessible
  10 + - Protected branch does not allow force push
10 11
11 v 6.7.3 12 v 6.7.3
12 - Fix the merge notification email not being sent (Pierre de La Morinerie) 13 - Fix the merge notification email not being sent (Pierre de La Morinerie)
app/views/projects/protected_branches/index.html.haml
  Diff comments   View file @8cc5e85
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 %ul 9 %ul
10 %li keep stable branches secured 10 %li keep stable branches secured
11 %li forced code review before merge to protected branches 11 %li forced code review before merge to protected branches
  12 + %li prevents branch from force push
12 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"} 13 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
13 14
14 - if can? current_user, :admin_project, @project 15 - if can? current_user, :admin_project, @project