Merge branch 'stable-2.12'

* stable-2.12:
  Update replication plugin with merge from stable-2.11
  Correct RebaseChangeOp running hooks
  Set version to 2.11.5
  Release notes for Gerrit 2.11.5
  Update replication plugin revision
  Display latest result of branch list screen's filter

Change-Id: Ie6b06da12c5bb46a65cd56f36808f8bfd35011a3
This commit is contained in:
David Pursehouse
2015-11-12 22:35:29 -08:00
4 changed files with 100 additions and 2 deletions

View File

@@ -207,8 +207,10 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen {
Query q = new Query(filterTxt.getValue());
if (match.equals(q.qMatch)) {
q.start(start);
} else if (query == null) {
q.run();
} else {
if (query == null) {
q.run();
}
query = q;
}
}