diff options
3 files changed, 11 insertions, 1 deletions
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java index 541ae1899b..1457a5d454 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java @@ -48,6 +48,7 @@ public class GerritConfig implements Cloneable { protected String anonymousCowardName; protected int suggestFrom; protected boolean useOnePageReview; + protected boolean hideRebase; public String getRegisterUrl() { return registerUrl; @@ -235,4 +236,12 @@ public class GerritConfig implements Cloneable { public void setUseOnePageReview(final boolean r) { useOnePageReview = r; } + + public boolean isHideRebase() { + return hideRebase; + } + + public void setHideRebase(final boolean r) { + hideRebase = r; + } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java index 0b3a0b904e..ed519e9ead 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java @@ -615,7 +615,7 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel actionsPanel.add(b); } - if (changeDetail.canRebase()) { + if (!Gerrit.getConfig().isHideRebase() && changeDetail.canRebase()) { final Button b = new Button(Util.C.buttonRebaseChange()); b.addClickHandler(new ClickHandler() { @Override diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java index 6b2b6304d0..a08b4606ad 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java @@ -105,6 +105,7 @@ class GerritConfigProvider implements Provider<GerritConfig> { "contributoragreements", false)); config.setGitDaemonUrl(cfg.getString("gerrit", null, "canonicalgiturl")); config.setGitHttpUrl(cfg.getString("gerrit", null, "gitHttpUrl")); + config.setHideRebase(cfg.getBoolean("gerrit", "hiderebase", false)); config.setUseOnePageReview(cfg.getBoolean("gerrit", "onepagereview", false)); config.setUseContactInfo(contactStore != null && contactStore.isEnabled()); config.setDownloadSchemes(downloadConfig.getDownloadSchemes()); |