opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0'

Browse Source 
* stable-3.0:
  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: Ibd894f61d0ce7d33b3024a8c0f07d322a87ffce0
This commit is contained in:
David Pursehouse
2019-06-17 16:24:13 +09:00
parent 800a351e30 da9c0c35ff
commit e9d30488da
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WORKSPACE
View File

@@ -66,7 +66,7 @@ http_file(
load("@bazel_skylib//lib:versions.bzl", "versions") 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") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")

2
java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
View File

@@ -38,7 +38,7 @@ public class MysqlAccountPatchReviewStore extends JdbcAccountPatchReviewStore {
@Override @Override
public StorageException convertError(String op, SQLException err) { public StorageException convertError(String op, SQLException err) {
switch (getSQLStateInt(err)) { switch (err.getErrorCode()) {
case 1022: // ER_DUP_KEY case 1022: // ER_DUP_KEY
case 1062: // ER_DUP_ENTRY case 1062: // ER_DUP_ENTRY
case 1169: // ER_DUP_UNIQUE; case 1169: // ER_DUP_UNIQUE;

4
polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.js
View File

@@ -27,6 +27,10 @@
_passwordUrl: String, _passwordUrl: String,
}, },
attached() {
this.loadData();
},
loadData() { loadData() {
const promises = []; const promises = [];

4
polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
View File

@@ -387,12 +387,14 @@ limitations under the License.
disabled="[[!_computeAddEmailButtonEnabled(_newEmail, _addingEmail)]]" disabled="[[!_computeAddEmailButtonEnabled(_newEmail, _addingEmail)]]"
on-tap="_handleAddEmailButton">Send verification</gr-button> on-tap="_handleAddEmailButton">Send verification</gr-button>
</fieldset> </fieldset>
<div hidden$="[[!_showHttpAuth(_serverConfig)]]"> <template is="dom-if" if="[[_showHttpAuth(_serverConfig)]]">
<div>
<h2 id="HTTPCredentials">HTTP Credentials</h2> <h2 id="HTTPCredentials">HTTP Credentials</h2>
<fieldset> <fieldset>
<gr-http-password id="httpPass"></gr-http-password> <gr-http-password id="httpPass"></gr-http-password>
</fieldset> </fieldset>
</div> </div>
</template>
<div hidden$="[[!_serverConfig.sshd]]"> <div hidden$="[[!_serverConfig.sshd]]">
<h2 <h2
id="SSHKeys" id="SSHKeys"

1
polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js
View File

@@ -166,7 +166,6 @@
this.$.accountInfo.loadData(), this.$.accountInfo.loadData(),
this.$.watchedProjectsEditor.loadData(), this.$.watchedProjectsEditor.loadData(),
this.$.groupList.loadData(), this.$.groupList.loadData(),
this.$.httpPass.loadData(),
this.$.identities.loadData(), this.$.identities.loadData(),
this.$.editPrefs.loadData(), this.$.editPrefs.loadData(),
this.$.diffPrefs.loadData(), this.$.diffPrefs.loadData(),