Merge branch 'master' of https://github.com/Mrbytes/gitblit

James Moger

2012-10-13 c658df9e87d65b08d5482cf04489cb0532ff83dd

 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)) {