summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/models
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-08 15:39:36 -0500
committerJames Moger <james.moger@gitblit.com>2014-03-08 15:39:36 -0500
commitf1b8822f715ea00da6b7d39a8ea63864aeda2d39 (patch)
tree7346119f7339db023df9e4457cc840e645ee4303 /src/main/java/com/gitblit/models
parentea07809018ab5266e5568a63144a9998a3c95af8 (diff)
downloadgitblit-f1b8822f715ea00da6b7d39a8ea63864aeda2d39.tar.gz
gitblit-f1b8822f715ea00da6b7d39a8ea63864aeda2d39.zip
Allow configuring the default integration branch for a repository
Diffstat (limited to 'src/main/java/com/gitblit/models')
-rw-r--r--src/main/java/com/gitblit/models/RepositoryModel.java1
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 5bd2ec03..f84e96b9 100644
--- a/src/main/java/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
@@ -88,6 +88,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
public boolean acceptNewPatchsets;
public boolean acceptNewTickets;
public boolean requireApproval;
+ public String mergeTo;
public transient boolean isCollectingGarbage;
public Date lastGC;