Allow configuring the default integration branch for a repository

James Moger

2014-03-08 f1b8822f715ea00da6b7d39a8ea63864aeda2d39

 src/main/java/com/gitblit/models/RepositoryModel.java

@@ -51,15 +51,12 @@
   public String lastChangeAuthor;

   public boolean hasCommits;

   public boolean showRemoteBranches;

   public boolean useTickets;

   public boolean useDocs;

   public boolean useIncrementalPushTags;

   public String incrementalPushTagPrefix;

   public AccessRestrictionType accessRestriction;

   public AuthorizationControl authorizationControl;

   public boolean allowAuthenticated;

   public boolean isFrozen;

   public boolean showReadme;

   public FederationStrategy federationStrategy;

   public List<String> federationSets;

   public boolean isFederated;

@@ -67,6 +64,7 @@
   public boolean skipSummaryMetrics;

   public String frequency;

   public boolean isBare;

   public boolean isMirror;

   public String origin;

   public String HEAD;

   public List<String> availableRefs;

@@ -87,6 +85,10 @@
   public int maxActivityCommits;

   public List<String> metricAuthorExclusions;

   public CommitMessageRenderer commitMessageRenderer;

   public boolean acceptNewPatchsets;

   public boolean acceptNewTickets;

   public boolean requireApproval;
   public String mergeTo;



   public transient boolean isCollectingGarbage;

   public Date lastGC;

@@ -107,6 +109,8 @@
      this.projectPath = StringUtils.getFirstPathElement(name);

      this.owners = new ArrayList<String>();

      this.isBare = true;

      this.acceptNewTickets = true;

      this.acceptNewPatchsets = true;



      addOwner(owner);

   }

@@ -140,6 +144,10 @@


   public void resetDisplayName() {

      displayName = null;

   }



   public String getRID() {

      return StringUtils.getSHA1(name);

   }



   @Override

@@ -209,11 +217,10 @@
      clone.accessRestriction = AccessRestrictionType.PUSH;

      clone.authorizationControl = AuthorizationControl.NAMED;

      clone.federationStrategy = federationStrategy;

      clone.showReadme = showReadme;

      clone.showRemoteBranches = false;

      clone.allowForks = false;

      clone.useDocs = useDocs;

      clone.useTickets = useTickets;

      clone.acceptNewPatchsets = false;

      clone.acceptNewTickets = false;
      clone.skipSizeCalculation = skipSizeCalculation;

      clone.skipSummaryMetrics = skipSummaryMetrics;

      clone.sparkleshareId = sparkleshareId;