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
This commit is contained in:
@@ -1 +1,2 @@
|
||||
0.27.0rc3
|
||||
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")
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -26,6 +26,10 @@
|
||||
_passwordUrl: String,
|
||||
},
|
||||
|
||||
attached() {
|
||||
this.loadData();
|
||||
},
|
||||
|
||||
loadData() {
|
||||
const promises = [];
|
||||
|
||||
|
@@ -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"
|
||||
|
@@ -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(),
|
||||
|
Reference in New Issue
Block a user