opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8' into stable-2.9

Browse Source 
* stable-2.8:
  Fix typo in REST API example for /test.submit_rule
  Documentation: mention that index.commitWithin uses time units
  Access-control: Administrators no longer have all capabilities by default
  Access-control: Specifying what is meant by ssh access

Conflicts:
	Documentation/access-control.txt

Change-Id: I2c73bec4c0d1521ca6640b06b148026b2daed251
This commit is contained in:
David Pursehouse
2014-03-22 18:19:45 -07:00
parent 468e4c3345 a3cce719fa
commit 9f9f74348c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/access-control.txt
View File

@@ -519,7 +519,7 @@ The `Owner` category controls which groups can modify the project's
configuration. Users who are members of an owner group can:
* Change the project description
* Create a branch through SSH
* Create a branch via the ssh command link:cmd-create-branch.html['create-branch']
* Create/delete a branch through the web UI
* Grant/revoke any access rights, including `Owner`
@@ -969,8 +969,7 @@ Optional access right to grant:
=== Administrator
The administrator role is the most powerful role known in the Gerrit universe.
This role may grant itself (or others) any access right, and it already has
all capabilities granted as well. By default the
This role may grant itself (or others) any access right. By default the
<<administrators,`Administrators` group>> is the group that has this role.
Mandatory access rights:
@@ -979,7 +978,8 @@ Mandatory access rights:
Suggested access rights to grant:
* <<examples_project-owner,Project owner rights>>
* <<examples_project-owner,`Project owner rights`>>
* Any <<global_capabilities,`capabilities`>> needed by the administrator
== Enforcing site wide access policies

3
Documentation/config-gerrit.txt
View File

@@ -1950,6 +1950,9 @@ If zero or negative, changes are committed after every write. This is
very costly but may be useful if offline reindexing is infeasible, or
for development servers.
+
Values can be specified using standard time unit abbreviations (`ms`,
`sec`, `min`, etc.).
+
This setting also applies when running the reindex program. If it is
configured to commit on every write, this will cause reindex to take
an unnecessarily long time to complete on sites that have a lot of

2
Documentation/rest-api-changes.txt
View File

@@ -1855,7 +1855,7 @@ a project-specific rule.
.Request
----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_type?filters=SKIP HTTP/1.0
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_rule?filters=SKIP HTTP/1.0
Content-Type: text/plain;charset-UTF-8
submit_rule(submit(R)) :-