diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-06-17 16:19:12 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-06-17 16:19:12 +0900 |
| commit | 9fbd683e386d103553ce4b0daa8e252d835abf38 (patch) | |
| tree | 6069f0a0efa7ab1fcc7ff1e0a01dbe52bde26937 | |
| parent | 1f8093b379360baf75f501f02a0d93124cd7c923 (diff) | |
| parent | 2c750e90dc3bbb4bb4e859f672526758d27b3851 (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Use dom-if instead of css when hiding gr-http-password
MysqlAccountPatchReviewStore: Fix duplicate key detection
Bazel: Bump minimum supported version to 0.26.1
Change-Id: I0e3fa45a28498777a6d0917e3484a4151dbb9b86
6 files changed, 16 insertions, 10 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 + @@ -67,7 +67,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") diff --git a/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java index d648ed0672..cb8c7071b8 100644 --- a/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java +++ b/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java @@ -38,7 +38,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; 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 b3d1396911..003e47105f 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 @@ -26,6 +26,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 21bf6493d8..3b6ddddb49 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 @@ -384,12 +384,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 f523034230..dd5590d3fd 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 @@ -165,7 +165,6 @@ this.$.accountInfo.loadData(), this.$.watchedProjectsEditor.loadData(), this.$.groupList.loadData(), - this.$.httpPass.loadData(), this.$.identities.loadData(), this.$.editPrefs.loadData(), this.$.diffPrefs.loadData(), |