summaryrefslogtreecommitdiffstats
path: root/gerrit-httpd
diff options
context:
space:
mode:
authorIsmo Haataja <ismo.haataja@digia.com>2014-04-08 14:22:53 +0300
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-06-20 19:25:46 +0200
commit13d7a710938489476309c7d384fee0f5f91e7e44 (patch)
treeff0417aac704dab6991378371b6c441c78e3393e /gerrit-httpd
parent44dc1922d3c82d72b37a0259adcea627c38b7ac6 (diff)
Commit message footer options for cherry-pick mode
When using cherry pick submit type, there is now additional options which define which footers are added to the commit message. Also, added footers can be limited to reviewers who gave the maximum approval score. These options are visible only for actual projects, not for All-Projects. Bug: issue 655 Originally-by: Mika Hamalainen <mika.hamalainen@accenture.com> Change-Id: Ibfb7193edde7f88607683adf061e8603cb382d06 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
Diffstat (limited to 'gerrit-httpd')
-rw-r--r--gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java
index 2533feb970..47f286d9fb 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java
@@ -1,4 +1,5 @@
// Copyright (C) 2009 The Android Open Source Project
+// Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -69,6 +70,7 @@ class ProjectDetailFactory extends Handler<ProjectDetail> {
detail.setCanModifyDescription(userIsOwner);
detail.setCanModifyMergeType(userIsOwner);
detail.setCanModifyState(userIsOwner);
+ detail.setCanModifyCherryPickOptions(userIsOwner);
final InheritedBoolean useContributorAgreements = new InheritedBoolean();
final InheritedBoolean useSignedOffBy = new InheritedBoolean();