opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Add documentation for the change report formatter interface
  CommitValidators: Fix repeated "Change-Id" in error message
  ChangeReportFormatter: Convert Input to use AutoValue.Builder
  Introduce Change Report formatter extension point
  Update elasticsearch-rest-client to 6.3.1
  user-review-ui: Fix typo

Change-Id: I93b87a5ca9b9ea9f272122c8661780673e533f67
This commit is contained in:
David Pursehouse 2018-07-07 09:41:15 +09:00
commit e178d5ec4c
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/dev-plugins.txt
View File

@ -2282,6 +2282,16 @@ by implementing `com.google.gerrit.extensions.config.ExternalIncludedIn`,
e.g. a plugin can provide a list of servers on which the change was
deployed.
[[change-report-formatting]]
== Change Report Formatting
When a change is pushed for review from the command line, Gerrit reports
the change(s) received with their URL and subject.
By implementing the
`com.google.gerrit.server.git.ChangeReportFormatter` interface, a plugin
may change the formatting of the report.
[[links-to-external-tools]]
== Links To External Tools

4
WORKSPACE
View File

@ -886,8 +886,8 @@ maven_jar(
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.3.0",
sha1 = "a95ef38262ef499aa07cdb736f4a47cb19162654",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.3.1",
sha1 = "99de036a2cd99dbecec1cc84f5d0e19032e74fa7",
)
JACKSON_VERSION = "2.6.6"

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@ -49,7 +49,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V6_2:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4";
case V6_3:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.0";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

2
gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@ -297,7 +297,7 @@ public class CommitValidators {
sb.append('\n');
sb.append("Hint: A potential ");
sb.append(FooterConstants.CHANGE_ID.getName());
sb.append("Change-Id was found, but it was not in the ");
sb.append(" was found, but it was not in the ");
sb.append("footer (last paragraph) of the commit message.");
}
}