From 600d43db0c6c19fafa2f5f313170f31cc82acb9c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Sep 2014 09:06:29 -0400
Subject: [PATCH] Respect repository default integration branch for new proposal tickets
---
src/main/java/com/gitblit/models/FederationModel.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/models/FederationModel.java b/src/main/java/com/gitblit/models/FederationModel.java
index 1d211ce..2c07c50 100644
--- a/src/main/java/com/gitblit/models/FederationModel.java
+++ b/src/main/java/com/gitblit/models/FederationModel.java
@@ -30,7 +30,7 @@
* Gitblit instance to pull the repositories and configuration from another
* Gitblit instance. This is a backup operation and can be considered something
* like svn-sync.
- *
+ *
*/
public class FederationModel implements Serializable, Comparable<FederationModel> {
@@ -45,7 +45,7 @@
public String frequency;
public String folder;
-
+
public boolean bare;
public boolean mirror;
@@ -68,7 +68,7 @@
/**
* The constructor for a remote server configuration.
- *
+ *
* @param serverName
*/
public FederationModel(String serverName) {
@@ -109,7 +109,7 @@
/**
* Updates the pull status of a particular repository in this federation
* registration.
- *
+ *
* @param repository
* @param status
*/
@@ -133,7 +133,7 @@
/**
* Iterates over the current pull results and returns the lowest pull
* status.
- *
+ *
* @return the lowest pull status of the registration
*/
public FederationPullStatus getLowestStatus() {
@@ -152,7 +152,7 @@
/**
* Returns true if this registration represents the result data sent by a
* pulling Gitblit instance.
- *
+ *
* @return true, if this is result data
*/
public boolean isResultData() {
@@ -181,7 +181,7 @@
/**
* Class that encapsulates a point-in-time pull result.
- *
+ *
*/
public static class RepositoryStatus implements Serializable, Comparable<RepositoryStatus> {
--
Gitblit v1.9.1