opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Clarify that receive.maxObjectSizeLimit does not get inherited
  Upgrade JGit to 4.9.3.201807311005-r
  Minor improvements in receive.maxObjectSizeLimit documentation
  Bazel: Consume rules_closure from HEAD
  Bump auto-value to 1.6.2
  dev-contributing: use buildifer 0.15.0

Change-Id: I7826131be3cc47fee531c292bd3ce25cf6be464f
This commit is contained in:
David Pursehouse
2018-08-02 20:59:52 +02:00
parent e81ce714a0 665426a4df
commit 03498bfdd5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config-gerrit.txt
View File

@@ -3726,7 +3726,7 @@ Gerrit administrators can use this setting to prevent developers
from pushing objects which are too large to Gerrit. from pushing objects which are too large to Gerrit.
+ +
This setting can also be set in the `project.config` This setting can also be set in the `project.config`
link:config-project-config.html[receive.maxObjectSizeLimit] in order (link:config-project-config.html[receive.maxObjectSizeLimit]) in order
to further reduce the global setting. The project specific setting is to further reduce the global setting. The project specific setting is
only honored when it further reduces the global limit. only honored when it further reduces the global limit.
+ +

9
Documentation/config-project-config.txt
View File

@@ -140,12 +140,13 @@ is larger than the given size the pack-parsing will abort and the push
operation will fail. If set to zero then there is no limit. operation will fail. If set to zero then there is no limit.
+ +
Project owners can use this setting to prevent developers from pushing Project owners can use this setting to prevent developers from pushing
objects which are too large to Gerrit. This setting can also be set it objects which are too large to Gerrit. This setting can also be set in
`gerrit.config` globally link:config-gerrit.html#receive.maxObjectSizeLimit[ `gerrit.config` globally (link:config-gerrit.html#receive.maxObjectSizeLimit[
receive.maxObjectSizeLimit]. receive.maxObjectSizeLimit]).
+ +
The project specific setting in `project.config` is only honored when it The project specific setting in `project.config` is only honored when it
further reduces the global limit. further reduces the global limit. The setting is not inherited from the
parent project; it must be explicitly set per project.
+ +
Default is zero. Default is zero.
+ +

2
Documentation/dev-contributing.txt
View File

@@ -166,7 +166,7 @@ To format Java source code, Gerrit uses the
link:https://github.com/google/google-java-format[`google-java-format`] link:https://github.com/google/google-java-format[`google-java-format`]
tool (version 1.5), and to format Bazel BUILD, WORKSPACE and .bzl files the tool (version 1.5), and to format Bazel BUILD, WORKSPACE and .bzl files the
link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`] link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
tool (version 0.12.0). tool (version 0.15.0).
These tools automatically apply format according to the style guides; this These tools automatically apply format according to the style guides; this
streamlines code review by reducing the need for time-consuming, tedious, streamlines code review by reducing the need for time-consuming, tedious,
and contentious discussions about trivial issues like whitespace. and contentious discussions about trivial issues like whitespace.