From 8cc5e85543b0a553536ebe70f01fa29e0b0f60bd Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 3 Apr 2014 17:06:11 +0300 Subject: [PATCH] Mention protected branch force push --- CHANGELOG | 1 + app/views/projects/protected_branches/index.html.haml | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 64a40ca..59e3e22 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 6.8.0 - Make the repository downloads path configurable - Create branches via API (sponsored by O'Reilly Media) - Changed permission of gitlab-satellites directory not to be world accessible + - Protected branch does not allow force push v 6.7.3 - Fix the merge notification email not being sent (Pierre de La Morinerie) diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 8b10076..4a6e894 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -9,6 +9,7 @@ %ul %li keep stable branches secured %li forced code review before merge to protected branches + %li prevents branch from force push %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"} - if can? current_user, :admin_project, @project -- libgit2 0.21.2