From 5187d67ee77cee8c77cf0a09a865ba52a196148a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Mon, 19 Mar 2018 13:04:01 -0400 Subject: [PATCH] Fix documentation about create and delete branches I29d8eb871 removed implicit permissions for admin and project owners allowing them to create and delete branches. Change-Id: Iac25d5e5570c2ce9589527bf4476d38d4cbe3bab --- Documentation/intro-project-owner.txt | 11 +++++++---- Documentation/project-configuration.txt | 8 ++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Documentation/intro-project-owner.txt b/Documentation/intro-project-owner.txt index 6056e573c6..38cfeaccf1 100644 --- a/Documentation/intro-project-owner.txt +++ b/Documentation/intro-project-owner.txt @@ -424,10 +424,13 @@ messages conform to line length limits. As project owner you can administrate the branches of your project in the Gerrit Web UI under `Projects` > `List` > > -`Branches`. In the Web UI both link:project-configuration.html#branch-creation[ -branch creation] and link:project-configuration.html#branch-deletion[branch -deletion] are allowed for project owners without requiring any -additional access rights. +`Branches`. In the Web UI link:project-configuration.html#branch-creation[ +branch creation] is allowed if you have +link:access-control.html#category_create[Create Reference] access right and +link:project-configuration.html#branch-deletion[branch deletion] is allowed if +you have the link:access-control.html#category_delete[Delete Reference] or the +link:access-control.html#category_push[Push] access right with the `force` +option. By setting `HEAD` on the project you can define its link:project-configuration.html#default-branch[default branch]. For convenience diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt index 2d3fd6609b..7d93c648a1 100644 --- a/Documentation/project-configuration.txt +++ b/Documentation/project-configuration.txt @@ -249,9 +249,7 @@ There are several ways to create a new branch in a project: To be able to create new branches the user must have the link:access-control.html#category_create[Create Reference] access -right. In addition, project owners and Gerrit administrators can create -new branches from the Web UI or via REST even without having the -`Create Reference` access right. +right. When using the Web UI, the REST endpoint or the SSH command it is only possible to create branches on commits that already exist in the @@ -287,9 +285,7 @@ another method, by force pushing nothing to an existing branch: To be able to delete branches, the user must have the link:access-control.html#category_delete[Delete Reference] or the link:access-control.html#category_push[Push] access right with the -`force` option. In addition, project owners and Gerrit administrators -can delete branches from the Web UI or via REST even without having the -`Force Push` access right. +`force` option. [[default-branch]] === Default Branch