From 24ba9d9d097b4e8ac18cfd456f826483b3853601 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 6 Nov 2024 10:47:12 -0700 Subject: [PATCH 1/3] Bump JGit to 3a7a9cb0e (stable-6.10 tip) This adds support for the 'union' merge conflict strategy via gitattribute configuration. Many Gerrit APIs do not load gitattribute data, so a follow-up change is necessary to enable it. $ git log --oneline --no-merges 1cd87ab79...3a7a9cb0e 3a7a9cb0e ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider 4f48a5b1e Add Union merge strategy support eeccc5a92 Update Apache sshd to 2.14.0 ed0835856 LfsConnectionFactoryTest: remove unnecessary cast 72652ff65 JSchSshProtocol2Test: remove unnecessary cast a2e477296 ApacheSshProtocol2Test: remove unnecessary cast 9e1cd8aec NoteMapMerger: remove unnecessary cast Change-Id: I4da8675847260697989e0a692e4a60dac310bae6 Release-Notes: Bump JGit to 3a7a9cb0e for Union merge conflict strategy support --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 1cd87ab7906..3a7a9cb0e89 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 1cd87ab79065b78a0774f20f1bfd522747c37c15 +Subproject commit 3a7a9cb0e89de263d0a5133949c9c9bed5141916 From e86ec0ca6ef8e1de719df94316886fd4b799a02a Mon Sep 17 00:00:00 2001 From: Kamil Musin Date: Wed, 18 Sep 2024 12:39:05 +0200 Subject: [PATCH 2/3] Reduce concurrency on frontend tests. Currently our tests fail when attempting to run them locally. The reason seems to be that, when concurrency is not set 1. All concurrently running tests, except for 1. Have document.visibilityState === "hidden" and document.hasFocus() === False. Which leads to failures with event handling (and for the logic that directly interacts with the visibilityState). This is a temporary fix, which we will hopefully be able to remove once the underlying issue is fixed in web-test-runner (or Chrome). Google-Bug-Id: b/365565157 Release-Notes: skip Change-Id: Id2d5534d46cd3fae8666b7159df2b18331ef2ffd (cherry picked from commit e895c08185c6a427273af16a446a4d9bc3cda397) --- polygerrit-ui/web-test-runner.config.mjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/polygerrit-ui/web-test-runner.config.mjs b/polygerrit-ui/web-test-runner.config.mjs index 415571c2990..eb377d2e58b 100644 --- a/polygerrit-ui/web-test-runner.config.mjs +++ b/polygerrit-ui/web-test-runner.config.mjs @@ -22,6 +22,9 @@ function testRunnerHtmlFactory() { /** @type {import('@web/test-runner').TestRunnerConfig} */ const config = { + // TODO: https://g-issues.gerritcodereview.com/issues/365565157 - undo the + // change once the underlying issue is fixed. + concurrency: 1, files: [ "app/**/*_test.{ts,js}", "!**/node_modules/**/*", From 8b76474a45e54979ec51208608c279883f4188f3 Mon Sep 17 00:00:00 2001 From: Dhruv Srivastava Date: Tue, 5 Nov 2024 21:14:01 +0530 Subject: [PATCH 3/3] Update permissions object to trigger re-render Release-Notes: skip Google-bug-id: b/327016695 Change-Id: I43d918fc0f5872229873d2e3b515409024dec155 (cherry picked from commit d3f797a2465bc58d44da3705ab11aeb7aa5359e9) --- .../elements/admin/gr-permission/gr-permission.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts index 0b49a873b8a..933fc96a4fd 100644 --- a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts +++ b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts @@ -353,8 +353,16 @@ export class GrPermission extends LitElement { if (!this.permission) { return; } - this.permission.value.modified = true; - this.permission.value.exclusive = (e.target as HTMLInputElement).checked; + // Update entire permission object to trigger a re-render since permission + // is marked as @property + this.permission = { + ...this.permission, + value: { + ...this.permission.value, + modified: true, + exclusive: (e.target as HTMLInputElement).checked, + }, + }; // Allows overall access page to know a change has been made. fire(this, 'access-modified', {}); }