opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Upgrade testcontainers to 1.12.3
  Hide "HTTP Credentials" if auth is not HTTP or HTTP_LDAP

Change-Id: I83d7bb1b8c12f5ddcef6896092d4bfc84029716d
This commit is contained in:
David Pursehouse
2019-10-29 16:43:09 +09:00
parent 359f2797f4 448f627f41
commit 08f262def4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@@ -1153,18 +1153,18 @@ maven_jar(
sha1 = "0f5a654e4675769c716e5b387830d19b501ca191",
)
TESTCONTAINERS_VERSION = "1.12.2"
TESTCONTAINERS_VERSION = "1.12.3"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
sha1 = "660d2fab2021154b98ce91d3104ff673a7ab9348",
sha1 = "e424a4549640e120acceac641ac909fcda58bf62",
)
maven_jar(
name = "testcontainers-elasticsearch",
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
sha1 = "88c751b2d787dfc19a91a7ee6fb623b881ffba5a",
sha1 = "c0796de5032070b8768ce78c78949b48f13c30db",
)
maven_jar(

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

@@ -84,7 +84,9 @@ limitations under the License.
<li><a href="#ChangeTableColumns">Change Table Columns</a></li>
<li><a href="#Notifications">Notifications</a></li>
<li><a href="#EmailAddresses">Email Addresses</a></li>
<li><a href="#HTTPCredentials">HTTP Credentials</a></li>
<template is="dom-if" if="[[_showHttpAuth(_serverConfig)]]">
<li><a href="#HTTPCredentials">HTTP Credentials</a></li>
</template>
<li hidden$="[[!_serverConfig.sshd]]"><a href="#SSHKeys">
SSH Keys
</a></li>