Merge "Document Byte Buddy issue with running mock tests"
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
index cf7ff2209..4c73fcf 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
@@ -192,7 +192,12 @@
override async updated() {
assertIsDefined(this.account, 'account');
const account = await this.getAccountsModel().fillDetails(this.account);
- if (account) this.account = account;
+ // AccountInfo returned by fillDetails has the email property set
+ // to the primary email of the account. This poses a problem in
+ // cases where a secondary email is used as the committer or author
+ // email. Therefore, only fill in the missing details to avoid
+ // displaying incorrect author or committer email.
+ if (account) this.account = Object.assign(account, this.account);
}
override render() {
diff --git a/resources/com/google/gerrit/server/mime/mime-types.properties b/resources/com/google/gerrit/server/mime/mime-types.properties
index 2626059..ad0200d 100644
--- a/resources/com/google/gerrit/server/mime/mime-types.properties
+++ b/resources/com/google/gerrit/server/mime/mime-types.properties
@@ -17,6 +17,7 @@
bazel = text/x-python
c = text/x-csrc
cfg = text/x-ttcn-cfg
+cjs = text/javascript
cl = text/x-common-lisp
clj = text/x-clojure
cljs = text/x-clojurescript
@@ -36,6 +37,7 @@
csharp = text/x-csharp
csproj = application/xml
css = text/css
+cts = application/typescript
cpp = text/x-c++src
cql = text/x-cassandra
cxx = text/x-c++src
@@ -148,6 +150,7 @@
mscgen = text/x-mscgen
mscin = text/x-mscgen
msgenny = text/x-msgenny
+mts = application/typescript
nb = text/x-mathematica
nginx.conf = text/x-nginx-conf
nsh = text/x-nsis
