Merge "Extract comment chip summary"
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt
index bc70451..348649d 100644
--- a/Documentation/access-control.txt
+++ b/Documentation/access-control.txt
@@ -1153,7 +1153,7 @@
use 'BLOCK' rules to enforce site-wide restrictions.
For example, if a user in the 'Foo Users' group tries to push to
-'refs/heads/mater' with the permissions below, that user will be blocked
+'refs/heads/master' with the permissions below, that user will be blocked
[options="header"]
|=========================================================================
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
index 141a24d..dd0eecd 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
@@ -141,7 +141,8 @@
style="--line-limit-marker:-1px; --content-width:100ch; --diff-max-width:none; --font-size:12px;"
>
</gr-diff>
- `
+ `,
+ {ignoreAttributes: ['style']}
);
});
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
index cf9c770..9126905 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
@@ -303,7 +303,8 @@
</a>
</div>
</div>
- `
+ `,
+ {ignoreAttributes: ['style']}
);
});
diff --git a/polygerrit-ui/app/elements/shared/gr-formatted-text/gr-formatted-text.ts b/polygerrit-ui/app/elements/shared/gr-formatted-text/gr-formatted-text.ts
index 011b80c..e230faf 100644
--- a/polygerrit-ui/app/elements/shared/gr-formatted-text/gr-formatted-text.ts
+++ b/polygerrit-ui/app/elements/shared/gr-formatted-text/gr-formatted-text.ts
@@ -122,7 +122,7 @@
repoCommentLinks => {
this.repoCommentLinks = repoCommentLinks;
// Always linkify URLs starting with https?://
- this.repoCommentLinks.ALWAYS_LINK_HTTP = {
+ this.repoCommentLinks['ALWAYS_LINK_HTTP'] = {
match: '(https?://\\S+[\\w/])',
link: '$1',
enabled: true,