From 029bf460e59f85b9cc16a1d3f062c55dde51f66d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 14 Dec 2019 15:21:57 +0900 Subject: [PATCH 1/6] polygerrit: Fix 'Unexpected trailing comma' lint errors Change-Id: Ic2d481f3a21bfec912d0fe8463f9616780d5f405 --- .../gr-reply-dialog/gr-reply-dialog_test.html | 16 ++++++++-------- .../core/gr-main-header/gr-main-header_test.html | 16 ++++++++-------- .../gr-account-label/gr-account-label_test.html | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html index 727373a29c..c7a13760a3 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html @@ -1084,7 +1084,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ false, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); assert.isTrue(fn( /* buttonLabel= */ 'Send', @@ -1093,7 +1093,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ false, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); // Mock nonempty comment draft array, with seding comments. assert.isFalse(fn( @@ -1103,7 +1103,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ false, /* includeComments= */ true, - /* disabled= */ false, + /* disabled= */ false )); // Mock nonempty comment draft array, without seding comments. assert.isTrue(fn( @@ -1113,7 +1113,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ false, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); // Mock nonempty change message. assert.isFalse(fn( @@ -1123,7 +1123,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ false, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); // Mock reviewers mutated. assert.isFalse(fn( @@ -1133,7 +1133,7 @@ limitations under the License. /* reviewersMutated= */ true, /* labelsChanged= */ false, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); // Mock labels changed. assert.isFalse(fn( @@ -1143,7 +1143,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ true, /* includeComments= */ false, - /* disabled= */ false, + /* disabled= */ false )); // Whole dialog is disabled. assert.isTrue(fn( @@ -1153,7 +1153,7 @@ limitations under the License. /* reviewersMutated= */ false, /* labelsChanged= */ true, /* includeComments= */ false, - /* disabled= */ true, + /* disabled= */ true )); }); diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html index ef14370a2f..81097f5d1d 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html @@ -116,7 +116,7 @@ limitations under the License. /* userLinks= */[], adminLinks, /* topMenus= */[], - /* docBaseUrl= */ '', + /* docBaseUrl= */ '' ), defaultLinks.concat({ title: 'Browse', @@ -185,7 +185,7 @@ limitations under the License. /* userLinks= */ [], adminLinks, topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Browse', links: adminLinks, @@ -221,7 +221,7 @@ limitations under the License. /* userLinks= */ [], adminLinks, topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Browse', links: adminLinks, @@ -260,7 +260,7 @@ limitations under the License. /* userLinks= */ [], adminLinks, topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Browse', links: adminLinks, @@ -297,7 +297,7 @@ limitations under the License. /* userLinks= */ [], /* adminLinks= */ [], topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Faves', links: defaultLinks[0].links.concat([{ @@ -328,7 +328,7 @@ limitations under the License. userLinks, /* adminLinks= */ [], topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Your', links: userLinks.concat([{ @@ -359,7 +359,7 @@ limitations under the License. /* userLinks= */ [], adminLinks, topMenus, - /* baseDocUrl= */ '', + /* baseDocUrl= */ '' ), [{ title: 'Browse', links: adminLinks.concat([{ @@ -398,4 +398,4 @@ limitations under the License. assert.equal(element._registerText, 'Sign up'); }); }); - \ No newline at end of file + diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.html b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.html index 740dfcf588..ac34b44545 100644 --- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.html +++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.html @@ -94,7 +94,7 @@ limitations under the License. assert.equal(element._computeShowEmailClass( {name: 'Andrew Bonventre'}, - /* additionalText= */ '', + /* additionalText= */ '' ), ''); From 6c00f489db720f9d960c6b65d3e504d129122bbc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 15 Dec 2019 09:33:15 +0900 Subject: [PATCH 2/6] Upgrade JGit to v5.6.0.201912101111-r 9710c6292 - JGit v5.6.0.201912101111-r 23125abc2 - Add ability to redirect stderr from git hooks d1bdfcd0a - Add possibility to get pure stderr output from AbortedByHookException 02dc0ca68 - Cleanup CommitAndLogCommandTest 5bf226d50 - CLI: Add support for excluding paths from Git log command b24ec8f71 - ReftableTest: Clean up boxing warnings on usage of String.format 62d16a914 - MergedReftable: Remove unnecessary semicolon 5185d288c - Introduce RefDatabase#hasFastTipsWithSha1 3198df186 - Update Orbit to R20191126223242 for 2019-12 473527e42 - Prepare 5.6.0-SNAPSHOT builds Change-Id: I554cee335ced3946f53e436e03936c6ad74fce4b --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index a7e454bc51..9710c6292a 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit a7e454bc51d359c2d46b19fd559f770cad8fd7d4 +Subproject commit 9710c6292ab0c8db28c6e3051ff7f1cca9e9a031 From 47482d20501dc9527e1d9ffe954595a4acb9b2fc Mon Sep 17 00:00:00 2001 From: Ben Rohlfs Date: Thu, 28 Nov 2019 08:58:00 +0100 Subject: [PATCH 3/6] Add a right margin to the search bar This creates some space between the search bar and the "header-browse-source" endpoint where you often see a "Repositories" link. Screenshots: https://imgur.com/a/19eLQme Change-Id: I54cc7540dd56628eeb3183da6195cd44f9ba536f (cherry picked from commit 174850ddb44234ff986c04e949ea60856bdb062e) --- .../app/elements/core/gr-main-header/gr-main-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html index fe8384eb90..d29858eedd 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html @@ -90,7 +90,7 @@ limitations under the License. } gr-smart-search { flex-grow: 1; - margin-left: var(--spacing-m); + margin: 0 var(--spacing-m); max-width: 500px; } gr-dropdown, From 12e4f2b06b47b903dec21983d647652b79d719bd Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 19 Dec 2019 16:24:43 -0500 Subject: [PATCH 4/6] Documentation: Update elasticsearch tests on macOS Change-Id: I9351138656b209932af4cdae6c05970cb427e598 --- Documentation/dev-bazel.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index 644dad3ed9..b62a0a4d62 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -366,8 +366,14 @@ The following values are currently supported for the group name: === Elasticsearch Successfully running the Elasticsearch tests requires Docker, and -may require setting the local -link:https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html[virtual memory]. +may require setting the local virtual memory on +link:https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html[linux] and +link:https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_set_vm_max_map_count_to_at_least_262144[macOS]. + +On macOS, if using link:https://docs.docker.com/docker-for-mac/[Docker Desktop], +the effective memory value can be set in the Preferences, under the Advanced tab. +The default value usually does not suffice and is causing premature container exits. +That default is currently 2 GB and should be set to at least 5 (GB). If Docker is not available, the Elasticsearch tests will be skipped. Note that Bazel currently does not show From e19f47d152736ac443723357ff55b871f4343ab3 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 19 Dec 2019 16:28:13 -0500 Subject: [PATCH 5/6] ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.6 Change-Id: I6608c9bfa03f6ff8acbbba090786a6e98a84b9ed --- javatests/com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index c692a3b4f8..8b310b95ab 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V6_7: return "blacktop/elasticsearch:6.7.2"; case V6_8: - return "blacktop/elasticsearch:6.8.5"; + return "blacktop/elasticsearch:6.8.6"; case V7_0: return "blacktop/elasticsearch:7.0.1"; case V7_1: From a10aa5e82225fe30c79c24f4d2157d72ee111852 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 19 Dec 2019 16:35:14 -0500 Subject: [PATCH 6/6] ElasticContainer: Upgrade V7_5 to elasticsearch 7.5.1 Upgrade elasticsearch-rest-client to 7.5.1, accordingly. Change-Id: I61571737cf49c4c074b921a4a55243b327e34424 --- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- tools/nongoogle.bzl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 8b310b95ab..c67a842bea 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -63,7 +63,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V7_4: return "blacktop/elasticsearch:7.4.2"; case V7_5: - return "blacktop/elasticsearch:7.5.0"; + return "blacktop/elasticsearch:7.5.1"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 15525958b7..03d42a7e82 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -94,8 +94,8 @@ def declare_nongoogle_deps(): # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.0", - sha1 = "62535b6fc3a4e943e88e7640eac22e29f03a696d", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.1", + sha1 = "094c155906dc94146fc5adc344ea2c676d487cf2", ) maven_jar(