Merge "Change horizontal padding of summary chip from 4px to 8px"
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 9876b53..096b068 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -14,10 +14,11 @@
'POST /changes/'
--
-The change input link:#change-input[ChangeInput] entity must be provided in the
-request body. It is not allowed to create changes on refs/tags/* or Gerrit
-internal refs such as refs/changes/*, refs/meta/external-ids/*, refs/users/*,
-etc.. and the request would fail with `400 Bad Request` in this case.
+The change input link:#change-input[ChangeInput] entity must be
+provided in the request body. It is not allowed to create changes
+under `refs/tags/` or Gerrit internal ref namespaces such as
+`refs/changes/`, `refs/meta/external-ids/`, and `refs/users/`. The
+request would fail with `400 Bad Request` in this case.
To create a change the calling user must be allowed to
link:access-control.html#category_push_review[upload to code review].
diff --git a/java/com/google/gerrit/server/experiments/ExperimentFeatures.java b/java/com/google/gerrit/server/experiments/ExperimentFeatures.java
index 13d9770..dc9148a 100644
--- a/java/com/google/gerrit/server/experiments/ExperimentFeatures.java
+++ b/java/com/google/gerrit/server/experiments/ExperimentFeatures.java
@@ -21,7 +21,7 @@
* the current release).
*
* <p>It may depend on the implementation if the result is decided on the per-request basis or not,
- * so the outcomes should not be persisted in {@link @Singleton}.
+ * so the outcomes should not be persisted in {@link com.google.inject.Singleton}.
*/
public interface ExperimentFeatures {
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
index cb64001..6ee82c9 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
@@ -326,6 +326,10 @@
return this.restApiService.getLoggedIn();
}
+ _getUnresolvedLabel(unresolved?: boolean) {
+ return unresolved ? 'Unresolved' : 'Resolved';
+ }
+
@observe('comments.*')
_commentsChanged() {
this._orderedComments = sortComments(this.comments);
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts
index ba541be..1a89a79 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts
@@ -132,7 +132,7 @@
id="commentInfoContainer"
hidden$="[[_hideActions(_showActions, _lastComment)]]"
>
- <span id="unresolvedLabel" hidden$="[[!unresolved]]">Unresolved</span>
+ <span id="unresolvedLabel">[[_getUnresolvedLabel(unresolved)]]</span>
<div id="actions">
<gr-button
id="replyBtn"
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
index e1c6bff..f2df89d 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
@@ -836,7 +836,7 @@
element.unresolved = false;
const label = element.shadowRoot?.querySelector('#unresolvedLabel');
assert.isOk(label);
- assert.isTrue(label!.hasAttribute('hidden'));
+ assert.isFalse(label!.hasAttribute('hidden'));
element.unresolved = true;
assert.isFalse(label!.hasAttribute('hidden'));
});
diff --git a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_html.ts b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_html.ts
index 73dc2d2..374cc62 100644
--- a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_html.ts
+++ b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_html.ts
@@ -38,7 +38,7 @@
}
.editor.new-change-summary-true iron-autogrow-textarea,
.viewer.new-change-summary-true {
- min-height: 160px;
+ min-height: 100px;
}
.editor iron-autogrow-textarea {
background-color: var(--view-background-color);
