Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  PostGpgKeys: Remove declaration of unthrown ResourceConflictException
  Set version to 2.15.19-SNAPSHOT
  Set version to 2.15.18
  ReviewerUtil: Keep only AccountLoader.Factory
  Update highlight.js
  Highlight VHDL
  ListMembers: Keep only AccountLoader.Factory in REST handler

Change-Id: Idcadd94fef5bca7a8e4520c86609c9ee074c4be8

java/com/google/gerrit/server/restapi/group/ListMembers.java

@@ -45,7 +45,7 @@ import org.kohsuke.args4j.Option;
 public class ListMembers implements RestReadView<GroupResource> {
   private final GroupCache groupCache;
   private final GroupControl.Factory groupControlFactory;
-  private final AccountLoader accountLoader;
+  private final AccountLoader.Factory accountLoaderFactory;
 
   @Option(name = "--recursive", usage = "to resolve included groups recursively")
   private boolean recursive;
@@ -57,7 +57,7 @@ public class ListMembers implements RestReadView<GroupResource> {
       AccountLoader.Factory accountLoaderFactory) {
     this.groupCache = groupCache;
     this.groupControlFactory = groupControlFactory;
-    this.accountLoader = accountLoaderFactory.create(true);
+    this.accountLoaderFactory = accountLoaderFactory;
   }
 
   public ListMembers setRecursive(boolean recursive) {
@@ -112,6 +112,7 @@ public class ListMembers implements RestReadView<GroupResource> {
 
   private List<AccountInfo> toAccountInfos(Set<Account.Id> members)
       throws PermissionBackendException {
+    AccountLoader accountLoader = accountLoaderFactory.create(true);
     List<AccountInfo> memberInfos = new ArrayList<>(members.size());
     for (Account.Id member : members) {
       memberInfos.add(accountLoader.get(member));

polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js

@@ -89,6 +89,7 @@
     'text/x-twig': 'twig',
     'text/x-vb': 'vb',
     'text/x-verilog': 'v',
+    'text/x-vhdl': 'vhdl',
     'text/x-yaml': 'yaml',
     'text/vbscript': 'vbscript',
   };