From 7baf2e4cd2ef8082b74937e26de75b01e630b5d4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 17 Apr 2014 12:00:35 -0400 Subject: [PATCH] Expose JGit 3.x receive pack settings as Gitblit settings --- src/main/java/com/gitblit/models/RepositoryModel.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java index 5bd2ec0..f84e96b 100644 --- a/src/main/java/com/gitblit/models/RepositoryModel.java +++ b/src/main/java/com/gitblit/models/RepositoryModel.java @@ -88,6 +88,7 @@ public boolean acceptNewPatchsets; public boolean acceptNewTickets; public boolean requireApproval; + public String mergeTo; public transient boolean isCollectingGarbage; public Date lastGC; -- Gitblit v1.9.1