From 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Fri, 07 Dec 2012 08:24:16 -0500
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

---
 src/com/gitblit/client/EditRepositoryDialog.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index aa6ad58..6f9ed52 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -227,9 +227,8 @@
 		isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"),
 				anRepository.isFrozen);
 
-		maxActivityCommits = new JComboBox(new Integer [] { 0, 25, 50, 75, 100, 150, 250, 500 });
+		maxActivityCommits = new JComboBox(new Integer [] { -1, 0, 25, 50, 75, 100, 150, 250, 500 });
 		maxActivityCommits.setSelectedItem(anRepository.maxActivityCommits);
-
 
 		mailingListsField = new JTextField(
 				ArrayUtils.isEmpty(anRepository.mailingLists) ? ""

--
Gitblit v1.9.1