diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java index 1b69b6d295..d0b70ae6bd 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java +++ b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java @@ -93,8 +93,7 @@ public class ElasticAccountIndex extends AbstractElasticIndex<Account.Id, Accoun public DataSource<AccountState> getSource(Predicate<AccountState> p, QueryOptions opts) throws QueryParseException { JsonArray sortArray = getSortArray(AccountField.ID.getName()); - return new ElasticQuerySource( - p, opts.filterFields(IndexUtils::accountFields), ACCOUNTS, sortArray); + return new ElasticQuerySource(p, opts.filterFields(IndexUtils::accountFields), type, sortArray); } @Override diff --git a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java index f694a05482..e74f2084fa 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java +++ b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java @@ -91,7 +91,7 @@ public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, I public DataSource<InternalGroup> getSource(Predicate<InternalGroup> p, QueryOptions opts) throws QueryParseException { JsonArray sortArray = getSortArray(GroupField.UUID.getName()); - return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), GROUPS, sortArray); + return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), type, sortArray); } @Override diff --git a/resources/com/google/gerrit/server/mime/mime-types.properties b/resources/com/google/gerrit/server/mime/mime-types.properties index af5ba657ea..e4d478e4f7 100644 --- a/resources/com/google/gerrit/server/mime/mime-types.properties +++ b/resources/com/google/gerrit/server/mime/mime-types.properties @@ -210,8 +210,8 @@ sql = text/x-sql ss = text/x-scheme st = text/x-stsrc stex = text/x-stex -sv = x-systemverilog -svh = x-systemverilog +sv = text/x-systemverilog +svh = text/x-systemverilog swift = text/x-swift tcl = text/x-tcl tex = text/x-latex |