Merge changes I374e9081,I9310b58f,I6df14c97,I93d0c7cd
* changes:
Update .mailmap
InitPluginStepsLoader: Remove redundant warning suppression
Upgrade auto-value to 1.6
Merge branch 'stable-2.15'
diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java
index 3d350b0..406033d 100644
--- a/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/java/com/google/gerrit/server/change/ChangeJson.java
@@ -331,6 +331,10 @@
this.options = Sets.immutableEnumSet(options);
}
+ /**
+ * See {@link ChangeData#lazyLoad}. If lazyLoad is set, converting data from index-backed {@link
+ * ChangeData} will fail with an exception.
+ */
public ChangeJson lazyLoad(boolean load) {
lazyLoad = load;
return this;
diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java
index 11327cd..e064265 100644
--- a/java/com/google/gerrit/server/project/ProjectState.java
+++ b/java/com/google/gerrit/server/project/ProjectState.java
@@ -261,7 +261,7 @@
ProjectLevelConfig cfg = new ProjectLevelConfig(fileName, this);
try (Repository git = gitMgr.openRepository(getNameKey())) {
- cfg.load(git);
+ cfg.load(git, config.getRevision());
} catch (IOException | ConfigInvalidException e) {
log.warn("Failed to load " + fileName + " for " + getName(), e);
}
diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java
index fccb14a..c877544 100644
--- a/java/com/google/gerrit/server/query/change/ChangeData.java
+++ b/java/com/google/gerrit/server/query/change/ChangeData.java
@@ -451,6 +451,13 @@
this.notes = notes;
}
+ /**
+ * If false, omit fields that require database/repo IO.
+ *
+ * <p>This is used to enforce that the dashboard is rendered from the index only. If {@code
+ * lazyLoad} is on, the {@code ChangeData} object will load from the database ("lazily") when a
+ * field accessor is called.
+ */
public ChangeData setLazyLoad(boolean load) {
lazyLoad = load;
return this;
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
index 64a817d..93a2658 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
@@ -105,7 +105,7 @@
display: none;
}
gr-linked-chip {
- --linked-chip-text-color: black;
+ --linked-chip-text-color: var(--primary-text-color);
}
.expanded #collapseBtn,
.openFile .fileViewActions {
diff --git a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.html b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.html
index 54e8ae2..71dc662 100644
--- a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.html
+++ b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.html
@@ -62,7 +62,7 @@
@apply(--vote-chip-styles);
}
--gr-button-background: var(--button-background-color, #f5f5f5);
- --gr-button-color: black;
+ --gr-button-color: var(--primary-text-color);
}
iron-selector > gr-button.iron-selected.max {
--button-background-color: var(--vote-color-max);
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
index 894c894..48b01f6 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
@@ -43,6 +43,9 @@
<dom-module id="gr-settings-view">
<template>
<style include="shared-styles">
+ :host {
+ color: var(--primary-text-color);
+ }
#newEmailInput {
width: 20em;
}
diff --git a/polygerrit-ui/app/styles/gr-page-nav-styles.html b/polygerrit-ui/app/styles/gr-page-nav-styles.html
index b1b5149..6d62f23 100644
--- a/polygerrit-ui/app/styles/gr-page-nav-styles.html
+++ b/polygerrit-ui/app/styles/gr-page-nav-styles.html
@@ -55,7 +55,7 @@
font-family: var(--font-family-bold);
}
.navStyles a {
- color: black;
+ color: var(--primary-text-color);
display: inline-block;
margin: .4em 0;
}
diff --git a/polygerrit-ui/app/styles/shared-styles.html b/polygerrit-ui/app/styles/shared-styles.html
index 8917fd7..f7f343b 100644
--- a/polygerrit-ui/app/styles/shared-styles.html
+++ b/polygerrit-ui/app/styles/shared-styles.html
@@ -92,7 +92,6 @@
border-left: 1px solid rgba(0, 0, 0, .3);
height: 20px;
margin: 0 8px;
-
}
.separator.transparent {
border-color: transparent;
@@ -104,6 +103,9 @@
strong {
font-family: var(--font-family-bold);
}
+ :host {
+ color: var(--primary-text-color);
+ }
</style>
</template>
</dom-module>
