Fixing build process by syncing govendor dependencies and gofmt.

Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2017-09-17 21:26:37 +02:00
parent 05ad1bb4a8
commit fe6c1a9ae2
13 changed files with 88 additions and 88 deletions

View File

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

View File

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

View File

@ -727,6 +727,7 @@ func (repo *Repository) BlockingDependencies(issueID int64) (_ []*Issue, err er
return issueDepsFull, nil return issueDepsFull, nil
} }
// NextIssueIndex returns the next issue index // NextIssueIndex returns the next issue index
// FIXME: should have a mutex to prevent producing same index for two issues that are created // FIXME: should have a mutex to prevent producing same index for two issues that are created
// closely enough. // closely enough.

View File

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

View File

@ -922,7 +922,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
// Check for open dependencies // Check for open dependencies
if form.Status == "close" { if form.Status == "close" {
canbeClosed := models.IssueNoDependenciesLeft(issue) canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
if !canbeClosed { if !canbeClosed {
if issue.IsPull { if issue.IsPull {

View File

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