opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  gr-change-metadata: Change "Hashtag" label to "Hashtags"
  ChangeScreen: Add missing 'Hashtags' label
  WorkQueue: Make defaultQueueSize final

Change-Id: I6b55a11f4b4cfffa66f4e044be325c3c8e81622b
This commit is contained in:
David Pursehouse 2018-05-07 16:51:51 +09:00
commit 3650cb9f56
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml
View File

@ -526,6 +526,7 @@ limitations under the License.
<td ui:field='actionDate'/>
</tr>
<tr ui:field='hashtagTableRow'>
<th><ui:msg>Hashtags</ui:msg></th>
<td colspan='2'>
<c:Hashtags ui:field='hashtags'/>
</td>

2
java/com/google/gerrit/server/git/WorkQueue.java
View File

@ -85,7 +85,7 @@ public class WorkQueue {
};
private ScheduledExecutorService defaultQueue;
private int defaultQueueSize;
private final int defaultQueueSize;
private final IdGenerator idGenerator;
private final CopyOnWriteArrayList<Executor> queues;

2
polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html
View File

@ -287,7 +287,7 @@ limitations under the License.
</section>
<template is="dom-if" if="[[serverConfig.note_db_enabled]]">
<section class="hashtag">
<span class="title">Hashtag</span>
<span class="title">Hashtags</span>
<span class="value">
<template is="dom-repeat" items="[[change.hashtags]]">
<gr-linked-chip