opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Update cookbook submodule
  MergeValidationListener: Expose the caller in onPreMerge() method
  Correctly detect symlinked log directory on startup
  RebaseIfNecessary: Use submitter identity as the committer
  Fix schema migration (115) when updating from Gerrit < 2.11
  Hide avatar image when there are no avatars available
  Add back ListChangesOption.DRAFT_COMMENTS

Change-Id: Ibaf1264332fdc30db0f0f548121db728f78927ae
This commit is contained in:
David Pursehouse
2016-01-08 15:21:28 +09:00
parent 9f2398edd4 97d4da6586
commit 394e6345ab
10 changed files with 114 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseIfNecessaryIT.java
View File

@@ -68,7 +68,7 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
assertSubmitter(change2.getChangeId(), 1);
assertSubmitter(change2.getChangeId(), 2);
assertPersonEquals(admin.getIdent(), head.getAuthorIdent());
assertPersonEquals(serverIdent.get(), head.getCommitterIdent());
assertPersonEquals(admin.getIdent(), head.getCommitterIdent());
}
@Test