From e14aa2878dafac624ee2ea58be0c7f784404d7ef Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 9 Jun 2019 09:48:33 +0200
Subject: [PATCH 1/3] Bazel: Bump minimum supported version to 0.26.1

Also harmonize the version used for Bazelisk to the same version.

Change-Id: I084a4b260e2731b28aef3da37aa815bd06bf6a8d
---
 .bazelversion | 3 ++-
 WORKSPACE     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index b2525e321c..260bb3085e 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1,2 @@
-0.27.0rc3
\ No newline at end of file
+0.26.1
+
diff --git a/WORKSPACE b/WORKSPACE
index af54b0f165..861398ee5b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -65,7 +65,7 @@ http_file(
 
 load("@bazel_skylib//lib:versions.bzl", "versions")
 
-versions.check(minimum_bazel_version = "0.25.0")
+versions.check(minimum_bazel_version = "0.26.1")
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
 

From 98b13a9809f366b57f269bcbb03c44af865e7089 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 13 Jun 2019 09:52:54 +0200
Subject: [PATCH 2/3] MysqlAccountPatchReviewStore: Fix duplicate key detection

The detection code is checking against SQL error code, even though
the SQL state is retrieved from the SQLException. As the consequence,
duplicate key state is not detected and primary key violation error
is reported during REST API call.

To rectify, retrieve the error code number from the SQL exception to
correctly detect duplicate key error. This approach is also based on
gwtorm code that is also using SQLException#getErrorCode() method.

Bug: Issue 10664
Change-Id: I678419a84af287edd8d121bddd2d11c2ed72eefe
---
 .../gerrit/server/schema/MysqlAccountPatchReviewStore.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
index 7cf28ffee5..6b49404828 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
@@ -36,7 +36,7 @@ public class MysqlAccountPatchReviewStore extends JdbcAccountPatchReviewStore {
 
   @Override
   public OrmException convertError(String op, SQLException err) {
-    switch (getSQLStateInt(err)) {
+    switch (err.getErrorCode()) {
       case 1022: // ER_DUP_KEY
       case 1062: // ER_DUP_ENTRY
       case 1169: // ER_DUP_UNIQUE;

From 4a11629f7c4f894cfa31aa7b0709a919337b6b9d Mon Sep 17 00:00:00 2001
From: Paladox none <thomasmulhall410@yahoo.com>
Date: Fri, 14 Jun 2019 18:50:53 +0000
Subject: [PATCH 3/3] Use dom-if instead of css when hiding gr-http-password

This is to prevent users from using css to reshow the
gr-http-password screen.

Change-Id: I42ca3b5285064b3f9475563927521396b928b7b8
---
 .../settings/gr-http-password/gr-http-password.js  |  5 +++++
 .../gr-settings-view/gr-settings-view.html         | 14 ++++++++------
 .../settings/gr-settings-view/gr-settings-view.js  |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.js b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.js
index 3dc92d1d85..abb5cc0ef7 100644
--- a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.js
+++ b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.js
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 (function() {
   'use strict';
 
@@ -23,6 +24,10 @@
       _passwordUrl: String,
     },
 
+    attached() {
+      this.loadData();
+    },
+
     loadData() {
       const promises = [];
 
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 aaf1006764..20fe151a4e 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
@@ -398,12 +398,14 @@ limitations under the License.
               disabled="[[!_computeAddEmailButtonEnabled(_newEmail, _addingEmail)]]"
               on-tap="_handleAddEmailButton">Send verification</gr-button>
         </fieldset>
-        <div hidden$="[[!_showHttpAuth(_serverConfig)]]">
-          <h2 id="HTTPCredentials">HTTP Credentials</h2>
-          <fieldset>
-            <gr-http-password id="httpPass"></gr-http-password>
-          </fieldset>
-        </div>
+        <template is="dom-if" if="[[_showHttpAuth(_serverConfig)]]">
+          <div>
+            <h2 id="HTTPCredentials">HTTP Credentials</h2>
+            <fieldset>
+              <gr-http-password id="httpPass"></gr-http-password>
+            </fieldset>
+          </div>
+        </template>
         <div hidden$="[[!_serverConfig.sshd]]">
           <h2
               id="SSHKeys"
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 d63798bf2a..5bb4061490 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
@@ -150,7 +150,6 @@
         this.$.accountInfo.loadData(),
         this.$.watchedProjectsEditor.loadData(),
         this.$.groupList.loadData(),
-        this.$.httpPass.loadData(),
       ];
 
       promises.push(this.$.restAPI.getPreferences().then(prefs => {