From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/client/EditRepositoryDialog.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 840281b..e15b154 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -108,6 +108,8 @@
private JCheckBox allowForks;
+ private JCheckBox verifyCommitter;
+
private JComboBox federationStrategy;
private JComboBox ownerField;
@@ -231,7 +233,8 @@
authorizationPanel.add(allowAuthenticated);
authorizationPanel.add(allowNamed);
- allowForks = new JCheckBox(Translation.get("gb.allowForks"), anRepository.allowForks);
+ allowForks = new JCheckBox(Translation.get("gb.allowForksDescription"), anRepository.allowForks);
+ verifyCommitter = new JCheckBox(Translation.get("gb.verifyCommitterDescription"), anRepository.verifyCommitter);
// federation strategies - remove ORIGIN choice if this repository has
// no origin.
@@ -274,6 +277,8 @@
.add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));
clonePushPanel
.add(newFieldPanel(Translation.get("gb.allowForks"), allowForks));
+ clonePushPanel
+ .add(newFieldPanel(Translation.get("gb.verifyCommitter"), verifyCommitter));
usersPalette = new JPalette<String>();
JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5));
@@ -484,6 +489,7 @@
repository.isFrozen = isFrozen.isSelected();
repository.allowForks = allowForks.isSelected();
+ repository.verifyCommitter = verifyCommitter.isSelected();
String ml = mailingListsField.getText();
if (!StringUtils.isEmpty(ml)) {
--
Gitblit v1.9.1