changes writeSignoffCommit from Boolean to String, now contains the actual commit header name.

Author: Robert Führicht

src/main/distrib/data/defaults.properties

@@ -638,14 +638,22 @@ tickets.redis.url =
 # SINCE 1.4.0
 tickets.perPage = 25
 
-# Appends the reviewers on a ticket in
-#	'Signed-off-by: author <author@example.com>'
-# lines in the merge commit message when the WebUI merge
-# button is clicked.
-# Set to true to enable.
+# Appends the reviewers with a positive on a ticket's
+# patchset in the form of 'value: author <author@example.com>'
+# (where value is this # parameter's value) lines to the 
+# merge commit message when the WebUI merge button is clicked.
+#
+# Set to the desired value to enable, e.g.:
+#
+#   tickets.writeSignoffCommit = Signed-off-by
+#
+# Defaults to being disabled, can be overridden on repositories.
+#
+# See the conventions on the meaning of possible values for this
+# parameter: https://git.wiki.kernel.org/index.php/CommitMessageConventions
 #
 # SINCE 1.9.0
-tickets.writeSignoffCommit = false
+tickets.writeSignoffCommit =
 
 # The folder where plugins are loaded from.
 #

src/main/java/com/gitblit/client/EditRepositoryDialog.java

@@ -98,7 +98,7 @@ public class EditRepositoryDialog extends JDialog {
 
 	private JComboBox requireScore;
 
-	private JCheckBox writeSignoffCommit;
+	private JComboBox writeSignoffCommit;
 
 	private JComboBox mergeToField;
 
@@ -225,13 +225,19 @@ private void initialize(int protocolVersion, RepositoryModel anRepository) {
 				anRepository.acceptNewPatchsets);
 		requireApproval = new JCheckBox(Translation.get("gb.requireApprovalDescription"),
 				anRepository.requireApproval);
-		Integer [] 	scores = { 0, 2, 4, 5, 6, 8 };
+		Integer [] 	scores = { -1, 0, 2, 4, 5, 6, 8 };
 		requireScore = new JComboBox(scores);
 		requireScore.setSelectedItem(anRepository.requireScore);
 		requireScore.setEnabled(anRepository.requireApproval);
 
-		writeSignoffCommit = new JCheckBox(Translation.get("gb.writeSignoffDescription"),
-				anRepository.writeSignoffCommit);
+		String [] signoffCommitMsgs = {
+			null,
+			"Signed-off-by",
+			"Reviewed-by",
+			"Acked-by"
+		};
+		writeSignoffCommit = new JComboBox(signoffCommitMsgs);
+		writeSignoffCommit.setSelectedItem(anRepository.writeSignoffCommit);
 
 		if (ArrayUtils.isEmpty(anRepository.availableRefs)) {
 			mergeToField = new JComboBox();
@@ -604,7 +610,8 @@ private boolean validateFields() {
 		repository.acceptNewTickets = acceptNewTickets.isSelected();
 		repository.requireApproval = requireApproval.isSelected();
 		repository.requireScore = (Integer) requireScore.getSelectedItem();
-		repository.writeSignoffCommit = writeSignoffCommit.isSelected();
+		repository.writeSignoffCommit = writeSignoffCommit.getSelectedItem() == null ? null
+				: writeSignoffCommit.getSelectedItem().toString();
 		repository.mergeTo = mergeToField.getSelectedItem() == null ? null
 				: Repository.shortenRefName(mergeToField.getSelectedItem().toString());
 		repository.useIncrementalPushTags = useIncrementalPushTags.isSelected();

src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -1271,16 +1271,19 @@ public MergeStatus merge(TicketModel ticket) {
 		StringBuilder messageBuilder = new StringBuilder();
 		messageBuilder.append(MessageFormat.format("Merged #{0,number,0} \"{1}\"", ticket.number, ticket.title));
 
-		// Add Signed-off-by tags to commit message footer if there are reviewers on this patchset
-		// and the setting is enabled on this repo.
-		if (repository.writeSignoffCommit) {
+		// Add sign-off tags to commit message footer if:
+		//  - there are reviewers on this patchset
+		//  - their review is positive
+		//  - the setting is enabled on repo this patchset is for
+		if (repository.writeSignoffCommit != null && repository.writeSignoffCommit.length() > 0) {
 			messageBuilder.append("\n\n");
 			for (Change change : ticket.getReviews(patchset)) {
 				// Skip sign-off for negative reviews
 				if (change.review.score.getValue() < 0) continue;
 				UserModel ruser = gitblit.getUserModel(change.author);
 				messageBuilder.append(MessageFormat.format(
-							"Signed-off-by: {0} <{1}>\n", 
+							"{0}: {1} <{2}>\n", 
+							repository.writeSignoffCommit,
 							ruser.getDisplayName(), 
 							StringUtils.isEmpty(ruser.emailAddress) ? (ruser.username + "@gitblit") : ruser.emailAddress
 						)

src/main/java/com/gitblit/manager/RepositoryManager.java

@@ -900,7 +900,7 @@ private RepositoryModel loadRepositoryModel(String repositoryName) {
 			model.acceptNewTickets = getConfig(config, "acceptNewTickets", true);
 			model.requireApproval = getConfig(config, "requireApproval", settings.getBoolean(Keys.tickets.requireApproval, false));
 			model.requireScore = getConfig(config, "requireScore", settings.getInteger(Keys.tickets.requireScore, -1));
-			model.writeSignoffCommit = getConfig(config, "writeSignoffCommit", settings.getBoolean(Keys.tickets.writeSignoffCommit, false));
+			model.writeSignoffCommit = getConfig(config, "writeSignoffCommit", settings.getString(Keys.tickets.writeSignoffCommit, null));
 			model.mergeTo = getConfig(config, "mergeTo", null);
 			model.mergeType = MergeType.fromName(getConfig(config, "mergeType", settings.getString(Keys.tickets.mergeType, null)));
 			model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);
@@ -1559,12 +1559,12 @@ public void updateConfiguration(Repository r, RepositoryModel repository) {
 			config.setBoolean(Constants.CONFIG_GITBLIT, null, "requireApproval", repository.requireApproval);
 		}
 		config.setInt(Constants.CONFIG_GITBLIT, null, "requireScore", repository.requireScore);
-		if (settings.getBoolean(Keys.tickets.writeSignoffCommit, false) == repository.writeSignoffCommit) {
+		if (settings.getString(Keys.tickets.writeSignoffCommit, null) == repository.writeSignoffCommit) {
 			// use default
 			config.unset(Constants.CONFIG_GITBLIT, null, "writeSignoffCommit");
 		} else {
 			// override default
-			config.setBoolean(Constants.CONFIG_GITBLIT, null, "writeSignoffCommit", repository.writeSignoffCommit);
+			config.setString(Constants.CONFIG_GITBLIT, null, "writeSignoffCommit", repository.writeSignoffCommit);
 		}
 		if (!StringUtils.isEmpty(repository.mergeTo)) {
 			config.setString(Constants.CONFIG_GITBLIT, null, "mergeTo", repository.mergeTo);

src/main/java/com/gitblit/models/RepositoryModel.java

@@ -90,7 +90,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 	public boolean acceptNewTickets;
 	public boolean requireApproval;
 	public int requireScore;
-	public boolean writeSignoffCommit;
+	public String writeSignoffCommit;
 	public String mergeTo;
 	public MergeType mergeType;
 

src/main/java/com/gitblit/wicket/GitBlitWebApp.properties

@@ -558,7 +558,7 @@ gb.requireApprovalDescription = patchsets must be approved before merge button i
 gb.requireScore = require score
 gb.requireScoreDescription = patchsets must be rated this high before merge button is enabled
 gb.writeSignoffCommit = write signoff commit
-gb.writeSignoffCommitDescription = reviewed patchsets will have 'Signed-off-by: reviewer <reviewer@example.com>' commit lines appended on merge 
+gb.writeSignoffCommitDescription = reviewed patchsets will have lines of the form 'value: reviewer name <reviewer email>' added to their merge commit.\nE.g. if set to <em>Signed-off-by</em>: 'Signed-off-by: reviewer <reviewer@example.com>'. Please see the <a target="_new" href="https://git.wiki.kernel.org/index.php/CommitMessageConventions">conventions</a> on the meaning of possible values for this.
 gb.topic = topic
 gb.proposalTickets = proposed changes
 gb.bugTickets = bugs

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -461,10 +461,17 @@ protected void onSubmit() {
 				new DropDownChoice<Integer>("choice",
 						new PropertyModel<Integer>(repositoryModel, "requireScore"),
 						scores)).setEnabled(allowRequireScore));
-		form.add(new BooleanOption("writeSignoffCommit",
+		List<String> signoffCommitMsgs = Arrays.asList(
+			null,
+			"Signed-off-by",
+			"Reviewed-by",
+			"Acked-by"
+		);
+		form.add(new ChoiceOption<String>("writeSignoffCommit",
 				getString("gb.writeSignoffCommit"),
 				getString("gb.writeSignoffCommitDescription"),
-				new PropertyModel<Boolean>(repositoryModel, "writeSignoffCommit")));
+				new PropertyModel<String>(repositoryModel, "writeSignoffCommit"),
+				signoffCommitMsgs));
 		form.add(new ChoiceOption<String>("mergeTo",
 				getString("gb.mergeTo"),
 				getString("gb.mergeToDescription"),