From 6255d15e53e67724645400b0c06fd5753ac48bd1 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 7 May 2018 08:26:16 +0900
Subject: [PATCH 1/3] WorkQueue: Make defaultQueueSize final

Change-Id: Ie274e6b23410057ecfcda1d9887a6c067d69a2bc
---
 .../src/main/java/com/google/gerrit/server/git/WorkQueue.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
index a61fb9a228..dd2c5f890b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -83,7 +83,7 @@ public class WorkQueue {
       };
 
   private Executor defaultQueue;
-  private int defaultQueueSize;
+  private final int defaultQueueSize;
   private final IdGenerator idGenerator;
   private final CopyOnWriteArrayList<Executor> queues;
 

From 669bed5f01d91c184cd0d43778586d3c8621224a Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 7 May 2018 10:32:55 +0900
Subject: [PATCH 2/3] ChangeScreen: Add missing 'Hashtags' label

Bug: Issue 8936
Change-Id: Iae30c1128546b52c98fa516906722d5de796eac2
---
 .../java/com/google/gerrit/client/change/ChangeScreen.ui.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml
index 536af4f91a..d629fc2126 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml
@@ -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>

From 5d6ec7c8062c7b16fc4ed9d307c4ac814a7bc309 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 7 May 2018 10:40:26 +0900
Subject: [PATCH 3/3] gr-change-metadata: Change "Hashtag" label to "Hashtags"

Change-Id: Ie768e70081e33e9435ecb76fd3fb0f891e8e146e
---
 .../elements/change/gr-change-metadata/gr-change-metadata.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html
index 5f885658fe..5ed7d1d784 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html
@@ -239,7 +239,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