Merge "Fix setting groups visibility" into stable-2.16
diff --git a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index 1b69b6d..d0b70ae 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
@@ -93,8 +93,7 @@
public DataSource<AccountState> getSource(Predicate<AccountState> p, QueryOptions opts)
throws QueryParseException {
JsonArray sortArray = getSortArray(AccountField.ID.getName());
- return new ElasticQuerySource(
- p, opts.filterFields(IndexUtils::accountFields), ACCOUNTS, sortArray);
+ return new ElasticQuerySource(p, opts.filterFields(IndexUtils::accountFields), type, sortArray);
}
@Override
diff --git a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index f694a05..e74f208 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -91,7 +91,7 @@
public DataSource<InternalGroup> getSource(Predicate<InternalGroup> p, QueryOptions opts)
throws QueryParseException {
JsonArray sortArray = getSortArray(GroupField.UUID.getName());
- return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), GROUPS, sortArray);
+ return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), type, sortArray);
}
@Override
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
index 88221d4..8bf42b7 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
@@ -96,6 +96,7 @@
'gr-diff gr-syntax gr-syntax-attribute': true,
'gr-diff gr-syntax gr-syntax-built_in': true,
'gr-diff gr-syntax gr-syntax-comment': true,
+ 'gr-diff gr-syntax gr-syntax-function': true,
'gr-diff gr-syntax gr-syntax-keyword': true,
'gr-diff gr-syntax gr-syntax-link': true,
'gr-diff gr-syntax gr-syntax-literal': true,
@@ -103,6 +104,7 @@
'gr-diff gr-syntax gr-syntax-meta-keyword': true,
'gr-diff gr-syntax gr-syntax-name': true,
'gr-diff gr-syntax gr-syntax-number': true,
+ 'gr-diff gr-syntax gr-syntax-params': true,
'gr-diff gr-syntax gr-syntax-regexp': true,
'gr-diff gr-syntax gr-syntax-selector-attr': true,
'gr-diff gr-syntax gr-syntax-selector-class': true,
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
index 41d3804..a122113 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
@@ -29,6 +29,12 @@
.contentText {
color: var(--syntax-default-color);
}
+ .gr-syntax-attribute {
+ color: var(--syntax-attribute-color);
+ }
+ .gr-syntax-function {
+ color: var(--syntax-function-color);
+ }
.gr-syntax-meta {
color: var(--syntax-meta-color);
}
@@ -94,6 +100,9 @@
.gr-syntax-template-tag {
color: var(--syntax-template-tag-color);
}
+ .gr-syntax-param {
+ color: var(--syntax-param-color);
+ }
</style>
</template>
</dom-module>
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 3c4270f..412b73e 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
@@ -208,6 +208,16 @@
</span>
</section>
<section>
+ <span class="title">Show Relative Dates In Changes Table</span>
+ <span class="value">
+ <input
+ id="relativeDateInChangeTable"
+ type="checkbox"
+ checked$="[[_localPrefs.relative_date_in_change_table]]"
+ on-change="_handleRelativeDateInChangeTable">
+ </span>
+ </section>
+ <section>
<span class="title">Diff view</span>
<span class="value">
<gr-select
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
index 916f97f..706b1ac 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
@@ -29,6 +29,7 @@
'signed_off_by',
'email_format',
'size_bar_in_change_table',
+ 'relative_date_in_change_table',
];
const GERRIT_DOCS_BASE_URL = 'https://gerrit-review.googlesource.com/' +
@@ -270,6 +271,11 @@
this._prefsChanged = true;
},
+ _handleRelativeDateInChangeTable() {
+ this.set('_localPrefs.relative_date_in_change_table',
+ this.$.relativeDateInChangeTable.checked);
+ },
+
_handleShowSizeBarsInFileListChanged() {
this.set('_localPrefs.size_bar_in_change_table',
this.$.showSizeBarsInFileList.checked);
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
index b0ef704..a51d310 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
@@ -88,6 +88,7 @@
email_strategy: 'ENABLED',
email_format: 'HTML_PLAINTEXT',
default_base_for_merges: 'FIRST_PARENT',
+ relative_date_in_change_table: false,
size_bar_in_change_table: true,
my: [
@@ -151,6 +152,9 @@
.firstElementChild.bindValue, preferences.email_format);
assert.equal(valueOf('Default Base For Merges', 'preferences')
.firstElementChild.bindValue, preferences.default_base_for_merges);
+ assert.equal(
+ valueOf('Show Relative Dates In Changes Table', 'preferences')
+ .firstElementChild.checked, false);
assert.equal(valueOf('Diff view', 'preferences')
.firstElementChild.bindValue, preferences.diff_view);
assert.equal(valueOf('Show size bars in file list', 'preferences')
diff --git a/polygerrit-ui/app/styles/themes/app-theme.html b/polygerrit-ui/app/styles/themes/app-theme.html
index fba3e97..ec445ae 100644
--- a/polygerrit-ui/app/styles/themes/app-theme.html
+++ b/polygerrit-ui/app/styles/themes/app-theme.html
@@ -109,6 +109,8 @@
--tooltip-text-color: #fff;
--syntax-default-color: var(--primary-text-color);
+ --syntax-attribute-color: var(--primary-text-color);
+ --syntax-function-color: #e90;
--syntax-meta-color: #FF1717;
--syntax-keyword-color: #9E0069;
--syntax-number-color: #164;
@@ -130,6 +132,7 @@
--syntax-regexp-color: #FA8602;
--syntax-selector-attr-color: #FA8602;
--syntax-template-tag-color: #FA8602;
+ --syntax-param-color: var(--primary-text-color);
}
@media screen and (max-width: 50em) {
:root {
diff --git a/resources/com/google/gerrit/server/mime/mime-types.properties b/resources/com/google/gerrit/server/mime/mime-types.properties
index af5ba65..e4d478e 100644
--- a/resources/com/google/gerrit/server/mime/mime-types.properties
+++ b/resources/com/google/gerrit/server/mime/mime-types.properties
@@ -210,8 +210,8 @@
ss = text/x-scheme
st = text/x-stsrc
stex = text/x-stex
-sv = x-systemverilog
-svh = x-systemverilog
+sv = text/x-systemverilog
+svh = text/x-systemverilog
swift = text/x-swift
tcl = text/x-tcl
tex = text/x-latex
