opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Fix documentation about create and delete branches

Change-Id: Ie5e982d4658336d09fcc8c3572785dc184a7a8e4
This commit is contained in:
David Pursehouse
2018-03-20 10:02:17 +09:00
parent f35bba9a19 5187d67ee7
commit d2612783fc
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/intro-project-owner.txt
View File

@@ -424,10 +424,13 @@ messages conform to line length limits.
As project owner you can administrate the branches of your project in As project owner you can administrate the branches of your project in
the Gerrit Web UI under `Projects` > `List` > <your project> > the Gerrit Web UI under `Projects` > `List` > <your project> >
`Branches`. In the Web UI both link:project-configuration.html#branch-creation[ `Branches`. In the Web UI link:project-configuration.html#branch-creation[
branch creation] and link:project-configuration.html#branch-deletion[branch branch creation] is allowed if you have
deletion] are allowed for project owners without requiring any link:access-control.html#category_create[Create Reference] access right and
additional access rights. 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 By setting `HEAD` on the project you can define its
link:project-configuration.html#default-branch[default branch]. For convenience link:project-configuration.html#default-branch[default branch]. For convenience

8
Documentation/project-configuration.txt
View File

@@ -251,9 +251,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 To be able to create new branches the user must have the
link:access-control.html#category_create[Create Reference] access link:access-control.html#category_create[Create Reference] access
right. In addition, project owners and Gerrit administrators can create right.
new branches from the Web UI or via REST even without having the
`Create Reference` access right.
When using the Web UI, the REST endpoint or the SSH command it is only 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 possible to create branches on commits that already exist in the
@@ -289,9 +287,7 @@ another method, by force pushing nothing to an existing branch:
To be able to delete branches, the user must have the 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_delete[Delete Reference] or the
link:access-control.html#category_push[Push] access right with the link:access-control.html#category_push[Push] access right with the
`force` option. In addition, project owners and Gerrit administrators `force` option.
can delete branches from the Web UI or via REST even without having the
`Force Push` access right.
[[default-branch]] [[default-branch]]
=== Default Branch === Default Branch