opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Enable OAuth token setting when gitBasicAuthPolicy equals OAUTH
  Enable HTTP password setting based upon gitBasicAuthPolicy
  Fix file_name column size in H2AccountPatchReviewStore
  GET files?reviewed: Don't fire N+1 selects for N patch sets
  Use lower case table/column/constraint names in H2AccountPatchReviewStore
  Fix clear methods in H2AccountPatchReviewStore
  JestClientBuilder: Format with google-java-format
  ES: Extract Jest client builder into separate class
  Remove unused import and apply formatting in AbstractElasticIndex
  Fix: Default values for Elastic index.* config values

Change-Id: I9e4ff0bd290df5b65ced77c541dec3b2b42a714a
This commit is contained in:
David Pursehouse
2017-04-25 13:52:55 +02:00
parent 086836ac47 e838482e9e
commit cfac9d34d8
5 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java
View File

@@ -21,6 +21,7 @@ import com.google.gerrit.client.api.ExtensionSettingsScreen;
import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.client.ui.MenuScreen;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.extensions.client.GitBasicAuthPolicy;
import java.util.HashSet;
import java.util.Set;
@@ -46,7 +47,8 @@ public abstract class SettingsScreen extends MenuScreen {
if (Gerrit.info().auth().isHttpPasswordSettingsEnabled()) {
linkByGerrit(Util.C.tabHttpAccess(), PageLinks.SETTINGS_HTTP_PASSWORD);
}
if (Gerrit.info().auth().isOAuth()) {
if (Gerrit.info().auth().isOAuth()
&& Gerrit.info().auth().gitBasicAuthPolicy() == GitBasicAuthPolicy.OAUTH) {
linkByGerrit(Util.C.tabOAuthToken(), PageLinks.SETTINGS_OAUTH_TOKEN);
}
if (Gerrit.info().gerrit().editGpgKeys()) {