From e5c982fa61f9f1b289d7454bdb92ee3167ee784d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 31 Mar 2014 12:20:58 -0400 Subject: [PATCH] Merge pull request #164 from jaa127/ldap-bind-escape --- 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