opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Use "abbreviation" instead of "abbreviatedName" for labels
  Update the 2.6 release notes
  Update 2.6 release notes to include fixes from 2.5.3 and 2.5.4

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java

Change-Id: If654a1444455102de0990d435a98fa313afa1699
This commit is contained in:
Shawn Pearce
2013-05-22 17:00:57 -07:00
parent 94b42aaf58 e7899c4072
commit 2c7acce786
8 changed files with 86 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config-labels.txt
View File

@@ -175,8 +175,8 @@ text"`. The `<#>` may be any positive or negative number with an
optional leading `+`.
[[label_abbreviatedName]]
`label.Label-Name.abbreviatedName`
[[label_abbreviation]]
`label.Label-Name.abbreviation`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
An abbreviated name for a label shown as a compact column header, for