Fixing build process by syncing govendor dependencies and gofmt.

Signed-off-by: Jonas Franz <info@jonasfranz.software>

models/action.go

@@ -473,7 +473,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 			}
 
 			// Check for dependencies, if there aren't any, close it
-			canbeClosed := IssueNoDependenciesLeft(issue)
+			canbeClosed := IssueNoDependenciesLeft(issue.ID)
 
 			if canbeClosed {
 				if err = issue.ChangeStatus(doer, repo, true); err != nil {

models/issue_comment.go

@@ -338,7 +338,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		OldTitle:         opts.OldTitle,
 		NewTitle:         opts.NewTitle,
 		DependentIssue:   opts.DependentIssue,
-		DependentIssueID: opts.DependentIssue.ID,
+		DependentIssueID: depId,
 	}
 
 	//fmt.Println(comment)

models/repo.go

@@ -699,7 +699,7 @@ func (repo *Repository) BlockedByDependencies(issueID int64)  (_ []*Issue, err e
 	issueDeps, err := repo.getBlockedByDependencies(x, issueID)
 	var issueDepsFull = make([]*Issue, 0)
 
-	for _, issueDep := range issueDeps{
+	for _, issueDep := range issueDeps {
 		issueDetails, _ := getIssueByID(x, issueDep.DependencyID)
 		issueDepsFull = append(issueDepsFull, issueDetails)
 	}
@@ -716,7 +716,7 @@ func (repo *Repository) BlockingDependencies(issueID int64)  (_ []*Issue, err er
 	issueDeps, err := repo.getBlockingDependencies(x, issueID)
 	var issueDepsFull = make([]*Issue, 0)
 
-	for _, issueDep := range issueDeps{
+	for _, issueDep := range issueDeps {
 		issueDetails, _ := getIssueByID(x, issueDep.IssueID)
 		issueDepsFull = append(issueDepsFull, issueDetails)
 	}
@@ -727,6 +727,7 @@ func (repo *Repository) BlockingDependencies(issueID int64)  (_ []*Issue, err er
 
 	return issueDepsFull, nil
 }
+
 // NextIssueIndex returns the next issue index
 // FIXME: should have a mutex to prevent producing same index for two issues that are created
 // closely enough.

models/repo_unit.go

@@ -150,7 +150,7 @@ func (r *RepoUnit) ExternalTrackerConfig() *ExternalTrackerConfig {
 }
 
 // IssueDependenciesConfig returns config for UnitTypeIssueDependencies
-func (r *RepoUnit) IssueDependenciesConfig() *UnitConfig{
+func (r *RepoUnit) IssueDependenciesConfig() *UnitConfig {
 	return r.Config.(*UnitConfig)
 }
 

modules/auth/repo_form.go

@@ -104,7 +104,6 @@ type RepoSettingForm struct {
 	TrackerURLFormat                 string
 	TrackerIssueStyle                string
 	EnablePulls                      bool
-	EnableIssueDependencies bool
 	EnableTimetracker                bool
 	AllowOnlyContributorsToTrackTime bool
 	EnableIssueDependencies          bool

routers/repo/issue.go

@@ -684,8 +684,8 @@ func ViewIssue(ctx *context.Context) {
 				ctx.Handle(500, "LoadAssignees", err)
 				return
 			}
-		} else if comment.Type == models.CommentTypeRemovedDependency || comment.Type == models.CommentTypeAddedDependency{
+		} else if comment.Type == models.CommentTypeRemovedDependency || comment.Type == models.CommentTypeAddedDependency {
-			if err = comment.LoadDepIssueDetails(); err != nil{
+			if err = comment.LoadDepIssueDetails(); err != nil {
 				ctx.Handle(http.StatusInternalServerError, "LoadDepIssueDetails", err)
 				return
 			}
@@ -920,12 +920,12 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 			!(issue.IsPull && issue.PullRequest.HasMerged) {
 
 			// Check for open dependencies
-			if form.Status == "close"{
+			if form.Status == "close" {
 
-				canbeClosed := models.IssueNoDependenciesLeft(issue)
+				canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
 
 				if !canbeClosed {
-					if issue.IsPull{
+					if issue.IsPull {
 						ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")
 						ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
 					} else {

routers/repo/issue_dependency_add.go

@@ -45,7 +45,7 @@ func AddDependency(c *context.Context) {
 	}
 
 	// Check if issue and dependency is the same
-	if dep.Index == issueIndex{
+	if dep.Index == issueIndex {
 		c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue"))
 	} else {
 

routers/repo/issue_dependency_remove.go

@@ -36,7 +36,7 @@ func RemoveDependency(c *context.Context) {
 		return
 	}
 
-	if depType != 1 && depType != 2{
+	if depType != 1 && depType != 2 {
 		c.Handle(http.StatusBadRequest, "GetDependecyType", nil)
 		return
 	}

routers/repo/pull.go

@@ -428,7 +428,7 @@ func MergePullRequest(ctx *context.Context) {
 
 	pr.Issue = issue
 	pr.Issue.Repo = ctx.Repo.Repository
-	canbeClosed := models.IssueNoDependenciesLeft(issue)
+	canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
 
 	if !canbeClosed {
 		ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")

routers/repo/setting.go

@@ -219,7 +219,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			})
 		}
 
-		if form.EnableIssueDependencies{
+		if form.EnableIssueDependencies {
 			units = append(units, models.RepoUnit{
 				RepoID: repo.ID,
 				Type:   models.UnitTypeIssueDependencies,