| commit | 6cca7dd74580b326b4f5dd59d211c4029cae7fac | [log] [tgz] |
|---|---|---|
| author | Paladox none <thomasmulhall410@yahoo.com> | Thu Nov 14 16:53:30 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Nov 14 16:53:30 2024 +0000 |
| tree | d204d0ce240372384725ed27c388d2de34402438 | |
| parent | 8d51cf1b1eb17bcf9a4b4c412c1ee445af4e063b [diff] | |
| parent | cf6199302d2c4a3d0018a7ce5d4556a917329f76 [diff] |
Merge "Return ResourceConflict error when suggested fix can't be applied." into stable-3.11
diff --git a/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog.ts b/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog.ts index ac2e7cc..beec0b5 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog.ts +++ b/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog.ts
@@ -110,6 +110,9 @@ .hide { display: none; } + #messageInput { + min-width: calc(72ch + 2px + 2 * var(--spacing-m) + 0.4px); + } @media only screen and (max-width: 40em) { .value { width: 29em;
diff --git a/polygerrit-ui/app/elements/shared/gr-suggestion-diff-preview/gr-suggestion-diff-preview.ts b/polygerrit-ui/app/elements/shared/gr-suggestion-diff-preview/gr-suggestion-diff-preview.ts index 136979d..7c33764 100644 --- a/polygerrit-ui/app/elements/shared/gr-suggestion-diff-preview/gr-suggestion-diff-preview.ts +++ b/polygerrit-ui/app/elements/shared/gr-suggestion-diff-preview/gr-suggestion-diff-preview.ts
@@ -130,6 +130,14 @@ ); subscribe( this, + () => this.getChangeModel().revisions$, + revisions => + (this.hasEdit = Object.values(revisions).some( + info => info._number === EDIT + )) + ); + subscribe( + this, () => this.getChangeModel().latestPatchNum$, x => (this.latestPatchNum = x) );