From 1bd777b5837bfe9b6a9bc1ce2079e867c22a3ba6 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 3 Mar 2018 21:07:10 +0100 Subject: [PATCH 01/83] Issue assignees are now loaded of a seperate table when displayed in the UI --- models/issue.go | 84 +++++++++++++------ models/issue_list.go | 24 +----- models/migrations/migrations.go | 2 + models/migrations/v58.go | 43 ++++++++++ models/models.go | 1 + models/pull.go | 2 +- models/webhook_dingtalk.go | 6 +- models/webhook_discord.go | 6 +- models/webhook_slack.go | 6 +- options/locale/locale_en-US.ini | 2 +- templates/repo/issue/list.tmpl | 8 +- .../repo/issue/view_content/sidebar.tmpl | 14 ++-- 12 files changed, 139 insertions(+), 59 deletions(-) create mode 100644 models/migrations/v58.go diff --git a/models/issue.go b/models/issue.go index 9106db281a275..d20a2dd2b5d46 100644 --- a/models/issue.go +++ b/models/issue.go @@ -2,6 +2,10 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package models import ( @@ -54,6 +58,14 @@ type Issue struct { Attachments []*Attachment `xorm:"-"` Comments []*Comment `xorm:"-"` Reactions ReactionList `xorm:"-"` + Assignees []*User `xorm:"-"` +} + +// IssueAssignees saves all issue assignees +type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` } var ( @@ -115,17 +127,49 @@ func (issue *Issue) loadPoster(e Engine) (err error) { return } -func (issue *Issue) loadAssignee(e Engine) (err error) { - if issue.Assignee == nil && issue.AssigneeID > 0 { - issue.Assignee, err = getUserByID(e, issue.AssigneeID) +func (issue *Issue) loadAssignees(e Engine) (err error) { + var assigneeIDs []IssueAssignees + + err = e.Where("issue_id = ?", issue.ID).Find(&assigneeIDs) + if err != nil { + return + } + + for _, assignee := range assigneeIDs { + user, err := getUserByID(e, assignee.AssigneeID) if err != nil { - issue.AssigneeID = -1 - issue.Assignee = NewGhostUser() - if !IsErrUserNotExist(err) { - return fmt.Errorf("getUserByID.(assignee) [%d]: %v", issue.AssigneeID, err) + user = NewGhostUser() + if IsErrUserNotExist(err) { + return nil } - err = nil - return + return err + } + issue.Assignees = append(issue.Assignees, user) + } + return +} + +func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { + err = issue.loadAssignees(x) + if err != nil { + return assignees, err + } + + return issue.Assignees, nil +} + +// MakeAssigneeList concats a string with all names of the assignees. Useful for logs. +func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { + err = issue.loadAssignees(x) + if err != nil { + return "", err + } + + for in, assignee := range issue.Assignees { + AssigneeList += assignee.Name + + if len(issue.Assignees) > (in + 1) { + AssigneeList += ", " } } return @@ -206,7 +250,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) { } } - if err = issue.loadAssignee(e); err != nil { + if err = issue.loadAssignees(e); err != nil { return } @@ -313,8 +357,11 @@ func (issue *Issue) APIFormat() *api.Issue { if issue.Milestone != nil { apiIssue.Milestone = issue.Milestone.APIFormat() } - if issue.Assignee != nil { - apiIssue.Assignee = issue.Assignee.APIFormat() + if len(issue.Assignees) > 0 { + for _, assignee := range issue.Assignees { + apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat()) + } + //apiIssue.Assignee = issue.Assignee.APIFormat() } if issue.IsPull { apiIssue.PullRequest = &api.PullRequestMeta{ @@ -572,19 +619,6 @@ func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) { return sess.Commit() } -// GetAssignee sets the Assignee attribute of this issue. -func (issue *Issue) GetAssignee() (err error) { - if issue.AssigneeID == 0 || issue.Assignee != nil { - return nil - } - - issue.Assignee, err = GetUserByID(issue.AssigneeID) - if IsErrUserNotExist(err) { - return nil - } - return err -} - // ReadBy sets issue to be read by given user. func (issue *Issue) ReadBy(userID int64) error { if err := UpdateIssueUserByRead(userID, issue.ID); err != nil { diff --git a/models/issue_list.go b/models/issue_list.go index 4910915cd09a9..93202c90aeb86 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -165,26 +165,10 @@ func (issues IssueList) getAssigneeIDs() []int64 { } func (issues IssueList) loadAssignees(e Engine) error { - assigneeIDs := issues.getAssigneeIDs() - if len(assigneeIDs) == 0 { - return nil - } - - assigneeMaps := make(map[int64]*User, len(assigneeIDs)) - err := e. - In("id", assigneeIDs). - Find(&assigneeMaps) - if err != nil { - return err - } - - for _, issue := range issues { - if issue.AssigneeID <= 0 { - continue - } - var ok bool - if issue.Assignee, ok = assigneeMaps[issue.AssigneeID]; !ok { - issue.Assignee = NewGhostUser() + for in := range issues { + err := issues[in].loadAssignees(e) + if err != nil { + return err } } return nil diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index dfaef2c78db65..bf5f0f063d4bc 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -168,6 +168,8 @@ var migrations = []Migration{ NewMigration("remove is_owner, num_teams columns from org_user", removeIsOwnerColumnFromOrgUser), // v57 -> v58 NewMigration("add closed_unix column for issues", addIssueClosedTime), + // v58 -> v59 + NewMigration("add multiple assignees", addMultipleAssignees), } // Migrate database to current version diff --git a/models/migrations/v58.go b/models/migrations/v58.go new file mode 100644 index 0000000000000..fab0d6d7b2260 --- /dev/null +++ b/models/migrations/v58.go @@ -0,0 +1,43 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/models" + + "github.com/go-xorm/xorm" +) + +func addMultipleAssignees(x *xorm.Engine) error { + + allIssues := []models.Issue{} + err := x.Find(&allIssues) + if err != nil { + return err + } + + // Create the table + type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + } + err = x.Sync2(IssueAssignees{}) + if err != nil { + return err + } + + // Range over all issues and insert a new entry for each issue/assignee + for _, issue := range allIssues { + if issue.AssigneeID != 0 { + _, err := x.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + if err != nil { + return err + } + } + } + + return nil +} diff --git a/models/models.go b/models/models.go index 7738e1a3c2132..162a1ed46bb71 100644 --- a/models/models.go +++ b/models/models.go @@ -119,6 +119,7 @@ func init() { new(RepoIndexerStatus), new(LFSLock), new(Reaction), + new(IssueAssignees), ) gonicNames := []string{"SSL", "UID"} diff --git a/models/pull.go b/models/pull.go index 15b3a4fe18528..2d5319cc720c7 100644 --- a/models/pull.go +++ b/models/pull.go @@ -197,7 +197,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { Body: apiIssue.Body, Labels: apiIssue.Labels, Milestone: apiIssue.Milestone, - Assignee: apiIssue.Assignee, + Assignees: apiIssue.Assignees, State: apiIssue.State, Comments: apiIssue.Comments, HTMLURL: pr.Issue.HTMLURL(), diff --git a/models/webhook_dingtalk.go b/models/webhook_dingtalk.go index e25e989084f21..5d78ae5b604d2 100644 --- a/models/webhook_dingtalk.go +++ b/models/webhook_dingtalk.go @@ -118,8 +118,12 @@ func getDingtalkPullRequestPayload(p *api.PullRequestPayload) (*DingtalkPayload, title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) text = p.PullRequest.Body case api.HookIssueAssigned: + list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + if err != nil { + return &DingtalkPayload{}, err + } title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName, - p.PullRequest.Assignee.UserName, p.Index, p.PullRequest.Title) + list, p.Index, p.PullRequest.Title) text = p.PullRequest.Body case api.HookIssueUnassigned: title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) diff --git a/models/webhook_discord.go b/models/webhook_discord.go index 6d39d8b9939d5..21b1b173f0b7a 100644 --- a/models/webhook_discord.go +++ b/models/webhook_discord.go @@ -191,8 +191,12 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta) text = p.PullRequest.Body color = warnColor case api.HookIssueAssigned: + list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + if err != nil { + return &DiscordPayload{}, err + } title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName, - p.PullRequest.Assignee.UserName, p.Index, p.PullRequest.Title) + list, p.Index, p.PullRequest.Title) text = p.PullRequest.Body color = successColor case api.HookIssueUnassigned: diff --git a/models/webhook_slack.go b/models/webhook_slack.go index dd25a8d7df7a8..07eb893ea70b1 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -172,8 +172,12 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink) attachmentText = SlackTextFormatter(p.PullRequest.Body) case api.HookIssueAssigned: + list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + if err != nil { + return &SlackPayload{}, err + } text = fmt.Sprintf("[%s] Pull request assigned to %s: %s by %s", p.Repository.FullName, - SlackLinkFormatter(setting.AppURL+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName), + SlackLinkFormatter(setting.AppURL+list, list), titleLink, senderLink) case api.HookIssueUnassigned: text = fmt.Sprintf("[%s] Pull request unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8f1f4f5f5b377..ef28f91283029 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -622,7 +622,7 @@ issues.new.open_milestone = Open Milestones issues.new.closed_milestone = Closed Milestones issues.new.assignee = Assignee issues.new.clear_assignee = Clear assignee -issues.new.no_assignee = No assignee +issues.new.no_assignees = Nobody assigned issues.no_ref = No Branch/Tag Specified issues.create = Create Issue issues.new_label = New Label diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 794a4881341b1..90fec0b1cbf87 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -156,7 +156,7 @@ - +
{{.i18n.Tr "repo.issues.action_assignee"}} @@ -212,9 +212,9 @@ {{.Milestone.Name}} {{end}} - {{if .Assignee}} - - + {{range .Assignees}} + + {{end}}

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 23fd91b0bd833..e43f428ae7d67 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -72,18 +72,22 @@ {{.i18n.Tr "repo.issues.new.assignee"}} -
+
{{.i18n.Tr "repo.issues.new.clear_assignee"}}
{{range .Assignees}} -
{{.Name}}
+ {{/* + {{if .IsChecked}}checked{{end}} + {{if .IsChecked}}octicon-check{{end}} +
{{.Name}}
*/}} + {{.Name}} {{end}}
- {{.i18n.Tr "repo.issues.new.no_assignee"}} + {{.i18n.Tr "repo.issues.new.no_assignee"}}
- {{if .Issue.Assignee}} - {{.Issue.Assignee.Name}} + {{range .Issue.Assignees}} + {{.Name}} {{end}}
From 3c0b4e16b15e4edfb779826d2a774992ccd29ea1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 4 Mar 2018 00:11:38 +0100 Subject: [PATCH 02/83] Multiple assignees work so far, but current state is alpha --- models/issue.go | 17 ++- models/issue_comment.go | 109 +++++++------- models/issue_user.go | 43 ++++++ models/migrations/v58.go | 46 ++++++ public/js/index.js | 134 +++++++++--------- routers/repo/issue.go | 3 - .../repo/issue/view_content/comments.tmpl | 32 +++-- .../repo/issue/view_content/sidebar.tmpl | 4 +- 8 files changed, 244 insertions(+), 144 deletions(-) diff --git a/models/issue.go b/models/issue.go index d20a2dd2b5d46..c085fc48e1a21 100644 --- a/models/issue.go +++ b/models/issue.go @@ -149,7 +149,7 @@ func (issue *Issue) loadAssignees(e Engine) (err error) { return } -func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { +func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { err = issue.loadAssignees(x) if err != nil { return assignees, err @@ -826,12 +826,15 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { // ChangeAssignee changes the Assignee field of this issue. func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { - var oldAssigneeID = issue.AssigneeID - issue.AssigneeID = assigneeID - if err = UpdateIssueUserByAssignee(issue); err != nil { + //var oldAssigneeID = issue.AssigneeID + //issue.AssigneeID = assigneeID + removed, err := UpdateIssueUserByAssignees(issue, assigneeID) + if err != nil { return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) } + fmt.Println("assif", assigneeID) + sess := x.NewSession() defer sess.Close() @@ -839,7 +842,7 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { return fmt.Errorf("loadRepo: %v", err) } - if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, oldAssigneeID, assigneeID); err != nil { + if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, assigneeID, removed); err != nil { return fmt.Errorf("createAssigneeComment: %v", err) } @@ -932,14 +935,14 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } - if opts.Issue.AssigneeID > 0 { + /*if opts.Issue.AssigneeID > 0 { if err = opts.Issue.loadRepo(e); err != nil { return err } if _, err = createAssigneeComment(e, doer, opts.Issue.Repo, opts.Issue, -1, opts.Issue.AssigneeID); err != nil { return err } - } + }*/ if opts.IsPull { _, err = e.Exec("UPDATE `repository` SET num_pulls = num_pulls + 1 WHERE id = ?", opts.Issue.RepoID) diff --git a/models/issue_comment.go b/models/issue_comment.go index f97c108a7fd9c..8c81cdf613f8b 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -75,23 +75,23 @@ const ( // Comment represents a comment in commit and issue page. type Comment struct { - ID int64 `xorm:"pk autoincr"` - Type CommentType - PosterID int64 `xorm:"INDEX"` - Poster *User `xorm:"-"` - IssueID int64 `xorm:"INDEX"` - LabelID int64 - Label *Label `xorm:"-"` - OldMilestoneID int64 - MilestoneID int64 - OldMilestone *Milestone `xorm:"-"` - Milestone *Milestone `xorm:"-"` - OldAssigneeID int64 - AssigneeID int64 - Assignee *User `xorm:"-"` - OldAssignee *User `xorm:"-"` - OldTitle string - NewTitle string + ID int64 `xorm:"pk autoincr"` + Type CommentType + PosterID int64 `xorm:"INDEX"` + Poster *User `xorm:"-"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + Label *Label `xorm:"-"` + OldMilestoneID int64 + MilestoneID int64 + OldMilestone *Milestone `xorm:"-"` + Milestone *Milestone `xorm:"-"` + AssigneeID int64 + RemovedAssignee bool + Assignee *User `xorm:"-"` + OldAssignee *User `xorm:"-"` + OldTitle string + NewTitle string CommitID int64 Line int64 @@ -244,15 +244,6 @@ func (c *Comment) LoadMilestone() error { // LoadAssignees if comment.Type is CommentTypeAssignees, then load assignees func (c *Comment) LoadAssignees() error { var err error - if c.OldAssigneeID > 0 { - c.OldAssignee, err = getUserByID(x, c.OldAssigneeID) - if err != nil { - if !IsErrUserNotExist(err) { - return err - } - c.OldAssignee = NewGhostUser() - } - } if c.AssigneeID > 0 { c.Assignee, err = getUserByID(x, c.AssigneeID) @@ -318,21 +309,21 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err LabelID = opts.Label.ID } comment := &Comment{ - Type: opts.Type, - PosterID: opts.Doer.ID, - Poster: opts.Doer, - IssueID: opts.Issue.ID, - LabelID: LabelID, - OldMilestoneID: opts.OldMilestoneID, - MilestoneID: opts.MilestoneID, - OldAssigneeID: opts.OldAssigneeID, - AssigneeID: opts.AssigneeID, - CommitID: opts.CommitID, - CommitSHA: opts.CommitSHA, - Line: opts.LineNum, - Content: opts.Content, - OldTitle: opts.OldTitle, - NewTitle: opts.NewTitle, + Type: opts.Type, + PosterID: opts.Doer.ID, + Poster: opts.Doer, + IssueID: opts.Issue.ID, + LabelID: LabelID, + OldMilestoneID: opts.OldMilestoneID, + MilestoneID: opts.MilestoneID, + RemovedAssignee: opts.RemovedAssignee, + AssigneeID: opts.AssigneeID, + CommitID: opts.CommitID, + CommitSHA: opts.CommitSHA, + Line: opts.LineNum, + Content: opts.Content, + OldTitle: opts.OldTitle, + NewTitle: opts.NewTitle, } if _, err = e.Insert(comment); err != nil { return nil, err @@ -474,14 +465,14 @@ func createMilestoneComment(e *xorm.Session, doer *User, repo *Repository, issue }) } -func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldAssigneeID, assigneeID int64) (*Comment, error) { +func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, assigneeID int64, removedAssignee bool) (*Comment, error) { return createComment(e, &CreateCommentOptions{ - Type: CommentTypeAssignees, - Doer: doer, - Repo: repo, - Issue: issue, - OldAssigneeID: oldAssigneeID, - AssigneeID: assigneeID, + Type: CommentTypeAssignees, + Doer: doer, + Repo: repo, + Issue: issue, + RemovedAssignee: removedAssignee, + AssigneeID: assigneeID, }) } @@ -514,17 +505,17 @@ type CreateCommentOptions struct { Issue *Issue Label *Label - OldMilestoneID int64 - MilestoneID int64 - OldAssigneeID int64 - AssigneeID int64 - OldTitle string - NewTitle string - CommitID int64 - CommitSHA string - LineNum int64 - Content string - Attachments []string // UUIDs of attachments + OldMilestoneID int64 + MilestoneID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + CommitID int64 + CommitSHA string + LineNum int64 + Content string + Attachments []string // UUIDs of attachments } // CreateComment creates comment of issue or commit. diff --git a/models/issue_user.go b/models/issue_user.go index 1aded0b44042b..03d526fc39dbd 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -51,6 +51,33 @@ func newIssueUsers(e Engine, repo *Repository, issue *Issue) error { return nil } +func updateIssueAssignees(e Engine, issue *Issue, assigneeID int64) (removed bool, err error) { + + // Check if the submitted user is already assigne, if yes delete him otherwise add him + var toBeDeleted bool + for _, assignee := range issue.Assignees { + if assignee.ID == assigneeID { + toBeDeleted = true + } + } + + assigneeIn := IssueAssignees{AssigneeID: assigneeID, IssueID: issue.ID} + + if toBeDeleted { + _, err = e.Delete(assigneeIn) + if err != nil { + return toBeDeleted, err + } + } else { + _, err = e.Insert(assigneeIn) + if err != nil { + return toBeDeleted, err + } + } + + return toBeDeleted, nil +} + func updateIssueUserByAssignee(e Engine, issue *Issue) (err error) { if _, err = e.Exec("UPDATE `issue_user` SET is_assigned = ? WHERE issue_id = ?", false, issue.ID); err != nil { return err @@ -81,6 +108,22 @@ func UpdateIssueUserByAssignee(issue *Issue) (err error) { return sess.Commit() } +// UpdateIssueUserByAssignee updates issue-user relation for assignee. +func UpdateIssueUserByAssignees(issue *Issue, assigneeID int64) (removed bool, err error) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return false, err + } + + removed, err = updateIssueAssignees(sess, issue, assigneeID) + if err != nil { + return removed, err + } + + return removed, sess.Commit() +} + // UpdateIssueUserByRead updates issue-user relation for reading. func UpdateIssueUserByRead(uid, issueID int64) error { _, err := x.Exec("UPDATE `issue_user` SET is_read=? WHERE uid=? AND issue_id=?", true, uid, issueID) diff --git a/models/migrations/v58.go b/models/migrations/v58.go index fab0d6d7b2260..50e97e3b18aeb 100644 --- a/models/migrations/v58.go +++ b/models/migrations/v58.go @@ -8,6 +8,7 @@ import ( "code.gitea.io/gitea/models" "github.com/go-xorm/xorm" + "code.gitea.io/gitea/modules/util" ) func addMultipleAssignees(x *xorm.Engine) error { @@ -39,5 +40,50 @@ func addMultipleAssignees(x *xorm.Engine) error { } } + // Updated the comment table + type Comment struct { + ID int64 `xorm:"pk autoincr"` + Type int + PosterID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + OldMilestoneID int64 + MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + + CommitID int64 + Line int64 + Content string `xorm:"TEXT"` + RenderedContent string `xorm:"-"` + + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + + // Reference issue in commit message + CommitSHA string `xorm:"VARCHAR(40)"` + } + err = x.Sync2(Comment{}) + if err != nil { + return err + } + + // Migrate comments + // First update everything to not have nulls in db + _, err = x.Where("type = ?", 9).Update(Comment{RemovedAssignee:false}) + + allAssignementComments := []Comment{} + err = x.Where("type = ?", 9).Find(&allAssignementComments) + + for _, comment := range allAssignementComments { + // Everytime where OldAssigneeID is > 0, the assignement was removed. + if comment.OldAssigneeID > 0 { + _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee:true}) + } + } + return nil } diff --git a/public/js/index.js b/public/js/index.js index 5d3d2a013dda9..61c159675e69c 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -179,81 +179,87 @@ function initCommentForm() { initBranchSelector(); initCommentPreviewTab($('.comment.form')); - // Labels - var $list = $('.ui.labels.list'); - var $noSelect = $list.find('.no-select'); - var $labelMenu = $('.select-label .menu'); - var hasLabelUpdateAction = $labelMenu.data('action') == 'update'; + // Listsubmit + function initListSubmits(selector, outerSelector) { + var $list = $('.ui.' + outerSelector + '.list'); + var $noSelect = $list.find('.no-select'); + var $listMenu = $('.' + selector + ' .menu'); + var hasLabelUpdateAction = $listMenu.data('action') == 'update'; + + $('.' + selector).dropdown('setting', 'onHide', function(){ + if (hasLabelUpdateAction) { + location.reload(); + } + }); - $('.select-label').dropdown('setting', 'onHide', function(){ - if (hasLabelUpdateAction) { - location.reload(); - } - }); + $listMenu.find('.item:not(.no-select)').click(function () { + if ($(this).hasClass('checked')) { + $(this).removeClass('checked'); + $(this).find('.octicon').removeClass('octicon-check'); + if (hasLabelUpdateAction) { + updateIssuesMeta( + $listMenu.data('update-url'), + "detach", + $listMenu.data('issue-id'), + $(this).data('id') + ); + } + } else { + $(this).addClass('checked'); + $(this).find('.octicon').addClass('octicon-check'); + if (hasLabelUpdateAction) { + updateIssuesMeta( + $listMenu.data('update-url'), + "attach", + $listMenu.data('issue-id'), + $(this).data('id') + ); + } + } - $labelMenu.find('.item:not(.no-select)').click(function () { - if ($(this).hasClass('checked')) { - $(this).removeClass('checked'); - $(this).find('.octicon').removeClass('octicon-check'); - if (hasLabelUpdateAction) { - updateIssuesMeta( - $labelMenu.data('update-url'), - "detach", - $labelMenu.data('issue-id'), - $(this).data('id') - ); + var listIds = []; + $(this).parent().find('.item').each(function () { + if ($(this).hasClass('checked')) { + listIds.push($(this).data('id')); + $($(this).data('id-selector')).removeClass('hide'); + } else { + $($(this).data('id-selector')).addClass('hide'); + } + }); + if (listIds.length == 0) { + $noSelect.removeClass('hide'); + } else { + $noSelect.addClass('hide'); } - } else { - $(this).addClass('checked'); - $(this).find('.octicon').addClass('octicon-check'); + $($(this).parent().data('id')).val(listIds.join(",")); + return false; + }); + $listMenu.find('.no-select.item').click(function () { if (hasLabelUpdateAction) { updateIssuesMeta( - $labelMenu.data('update-url'), - "attach", - $labelMenu.data('issue-id'), - $(this).data('id') + $listMenu.data('update-url'), + "clear", + $listMenu.data('issue-id'), + "" ); } - } - var labelIds = []; - $(this).parent().find('.item').each(function () { - if ($(this).hasClass('checked')) { - labelIds.push($(this).data('id')); - $($(this).data('id-selector')).removeClass('hide'); - } else { - $($(this).data('id-selector')).addClass('hide'); - } - }); - if (labelIds.length == 0) { - $noSelect.removeClass('hide'); - } else { - $noSelect.addClass('hide'); - } - $($(this).parent().data('id')).val(labelIds.join(",")); - return false; - }); - $labelMenu.find('.no-select.item').click(function () { - if (hasLabelUpdateAction) { - updateIssuesMeta( - $labelMenu.data('update-url'), - "clear", - $labelMenu.data('issue-id'), - "" - ); - } + $(this).parent().find('.item').each(function () { + $(this).removeClass('checked'); + $(this).find('.octicon').removeClass('octicon-check'); + }); - $(this).parent().find('.item').each(function () { - $(this).removeClass('checked'); - $(this).find('.octicon').removeClass('octicon-check'); + $list.find('.item').each(function () { + $(this).addClass('hide'); + }); + $noSelect.removeClass('hide'); + $($(this).parent().data('id')).val(''); }); + } - $list.find('.item').each(function () { - $(this).addClass('hide'); - }); - $noSelect.removeClass('hide'); - $($(this).parent().data('id')).val(''); - }); + // Init labels and assignees + initListSubmits('select-label', 'labels'); + initListSubmits('select-assignees', 'assignees'); function selectItem(select_id, input_id) { var $menu = $(select_id + ' .menu'); diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 230b0e939d923..80e8c6e448c7a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -904,9 +904,6 @@ func UpdateIssueAssignee(ctx *context.Context) { assigneeID := ctx.QueryInt64("id") for _, issue := range issues { - if issue.AssigneeID == assigneeID { - continue - } if err := issue.ChangeAssignee(ctx.User, assigneeID); err != nil { ctx.ServerError("ChangeAssignee", err) return diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 3557c5d3c1df3..edd430349d5d7 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -118,15 +118,29 @@ {{else if eq .Type 9}}
- {{if gt .AssigneeID 0}}{{if eq .Poster.ID .AssigneeID}} - - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} - {{else}} - - {{.Assignee.Name}} {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}} {{end}}{{else if gt .OldAssigneeID 0}} - - - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} {{end}} + {{if gt .AssigneeID 0}} + {{if .RemovedAssignee}} + + + + + {{.Assignee.Name}} + {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} + + {{else}} + + + + + {{.Assignee.Name}} + {{if eq .Poster.ID .AssigneeID}} + {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}} + {{end}} + + {{end}} + {{end}}
{{else if eq .Type 10}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index e43f428ae7d67..747e9b3c11f22 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -67,7 +67,7 @@
-
+
{{.i18n.Tr "repo.issues.new.assignee"}} @@ -83,7 +83,7 @@ {{end}}
-
+
{{.i18n.Tr "repo.issues.new.no_assignee"}}
{{range .Issue.Assignees}} From 3d69908762e47e9a8f249caa7db5d53ebd10fad9 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 4 Mar 2018 00:33:34 +0100 Subject: [PATCH 03/83] Various cleanups --- models/issue.go | 8 ++------ models/issue_comment.go | 1 - models/issue_list.go | 10 ---------- models/issue_user.go | 4 ++-- routers/api/v1/repo/issue.go | 1 + 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/models/issue.go b/models/issue.go index c085fc48e1a21..c26ac01f15df8 100644 --- a/models/issue.go +++ b/models/issue.go @@ -826,15 +826,11 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { // ChangeAssignee changes the Assignee field of this issue. func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { - //var oldAssigneeID = issue.AssigneeID - //issue.AssigneeID = assigneeID removed, err := UpdateIssueUserByAssignees(issue, assigneeID) if err != nil { return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) } - fmt.Println("assif", assigneeID) - sess := x.NewSession() defer sess.Close() @@ -846,11 +842,11 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { return fmt.Errorf("createAssigneeComment: %v", err) } - issue.Assignee, err = GetUserByID(issue.AssigneeID) + /*issue.Assignee, err = GetUserByID(issue.AssigneeID) if err != nil && !IsErrUserNotExist(err) { log.Error(4, "GetUserByID [assignee_id: %v]: %v", issue.AssigneeID, err) return nil - } + }*/ // Error not nil here means user does not exist, which is remove assignee. isRemoveAssignee := err != nil diff --git a/models/issue_comment.go b/models/issue_comment.go index 8c81cdf613f8b..76aa51224da13 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -89,7 +89,6 @@ type Comment struct { AssigneeID int64 RemovedAssignee bool Assignee *User `xorm:"-"` - OldAssignee *User `xorm:"-"` OldTitle string NewTitle string diff --git a/models/issue_list.go b/models/issue_list.go index 93202c90aeb86..f98de06bb7ebf 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -154,16 +154,6 @@ func (issues IssueList) loadMilestones(e Engine) error { return nil } -func (issues IssueList) getAssigneeIDs() []int64 { - var ids = make(map[int64]struct{}, len(issues)) - for _, issue := range issues { - if _, ok := ids[issue.AssigneeID]; !ok { - ids[issue.AssigneeID] = struct{}{} - } - } - return keysInt64(ids) -} - func (issues IssueList) loadAssignees(e Engine) error { for in := range issues { err := issues[in].loadAssignees(e) diff --git a/models/issue_user.go b/models/issue_user.go index 03d526fc39dbd..7d7cdb0d3cf5a 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -14,7 +14,7 @@ type IssueUser struct { UID int64 `xorm:"INDEX"` // User ID. IssueID int64 IsRead bool - IsAssigned bool + //IsAssigned bool IsMentioned bool } @@ -34,7 +34,7 @@ func newIssueUsers(e Engine, repo *Repository, issue *Issue) error { issueUsers = append(issueUsers, &IssueUser{ IssueID: issue.ID, UID: assignee.ID, - IsAssigned: assignee.ID == issue.AssigneeID, + //IsAssigned: assignee.ID == issue.AssigneeID, }) isPosterAssignee = isPosterAssignee || assignee.ID == issue.PosterID } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 8507e65efa5fd..2bdea7a4168df 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -242,6 +242,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { issue.Content = *form.Body } + // This is the thing to add asignees. TODO if ctx.Repo.IsWriter() && form.Assignee != nil && (issue.Assignee == nil || issue.Assignee.LowerName != strings.ToLower(*form.Assignee)) { if len(*form.Assignee) == 0 { From 87209251df6c1de69a402b6df5a9f5a44546ab27 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 5 Mar 2018 22:05:11 +0100 Subject: [PATCH 04/83] Made removing all assignees working again --- models/issue.go | 36 ++++++++++++++++--- routers/repo/issue.go | 16 +++++++-- .../repo/issue/view_content/sidebar.tmpl | 2 +- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/models/issue.go b/models/issue.go index c26ac01f15df8..fed7389f2ebb0 100644 --- a/models/issue.go +++ b/models/issue.go @@ -41,7 +41,7 @@ type Issue struct { MilestoneID int64 `xorm:"INDEX"` Milestone *Milestone `xorm:"-"` Priority int - AssigneeID int64 `xorm:"INDEX"` + AssigneeID int64 `xorm:"-"` Assignee *User `xorm:"-"` IsClosed bool `xorm:"INDEX"` IsRead bool `xorm:"-"` @@ -139,13 +139,18 @@ func (issue *Issue) loadAssignees(e Engine) (err error) { user, err := getUserByID(e, assignee.AssigneeID) if err != nil { user = NewGhostUser() - if IsErrUserNotExist(err) { - return nil + if !IsErrUserNotExist(err) { + return err } - return err } issue.Assignees = append(issue.Assignees, user) } + + // Check if we have at least one assignee and if yes put it in as `Assignee` + if len(issue.Assignees) > 0 { + issue.Assignee = issue.Assignees[0] + } + return } @@ -158,6 +163,29 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { return issue.Assignees, nil } +func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { + err = issue.loadAssignees(x) + if err != nil { + return false, err + } + + for _, assignee := range issue.Assignees { + if assignee.ID == user.ID { + return true, nil + } + } + + return false, nil +} + +func ClearAssigneesByIssue(issue *Issue) (err error) { + _, err = x.Delete(IssueAssignees{IssueID:issue.ID}) + if err != nil { + return err + } + return nil +} + // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { err = issue.loadAssignees(x) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 80e8c6e448c7a..3294091dc3d56 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -903,10 +903,20 @@ func UpdateIssueAssignee(ctx *context.Context) { } assigneeID := ctx.QueryInt64("id") + action := ctx.Query("action") + for _, issue := range issues { - if err := issue.ChangeAssignee(ctx.User, assigneeID); err != nil { - ctx.ServerError("ChangeAssignee", err) - return + switch action { + case "clear": + if err := models.ClearAssigneesByIssue(issue); err != nil { + ctx.ServerError("ClearAssignees", err) + return + } + default: + if err := issue.ChangeAssignee(ctx.User, assigneeID); err != nil { + ctx.ServerError("ChangeAssignee", err) + return + } } } ctx.JSON(200, map[string]interface{}{ diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 747e9b3c11f22..6af84a95b811f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -87,7 +87,7 @@ {{.i18n.Tr "repo.issues.new.no_assignee"}}
{{range .Issue.Assignees}} - {{.Name}} +  {{.Name}} {{end}}
From edad903a15ac6e1369f2b93a271ec14ac3ada64f Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 5 Mar 2018 22:11:52 +0100 Subject: [PATCH 05/83] Don't send the action attribute, its not used --- public/js/index.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/public/js/index.js b/public/js/index.js index 61c159675e69c..af008ecdd5a93 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -192,7 +192,19 @@ function initCommentForm() { } }); + $listMenu.find('.item:not(.no-select)').click(function () { + + if (selector == 'select-assignees') { + updateIssuesMeta( + $listMenu.data('update-url'), + "", + $listMenu.data('issue-id'), + $(this).data('id') + ); + return false; + } + if ($(this).hasClass('checked')) { $(this).removeClass('checked'); $(this).find('.octicon').removeClass('octicon-check'); From 269f426d450661d1e2c7bb9b6901e3549cf7a2e6 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Mar 2018 00:42:08 +0100 Subject: [PATCH 06/83] Made adding assignes via gui almost work --- models/issue.go | 32 ++++++++++++++- modules/auth/repo_form.go | 1 + options/locale/locale_en-US.ini | 4 +- public/js/index.js | 4 +- routers/api/v1/repo/issue.go | 3 +- routers/repo/issue.go | 41 +++++++++++++------ routers/repo/pull.go | 7 +++- templates/repo/issue/new_form.tmpl | 41 ++++++++++++++++--- .../repo/issue/view_content/sidebar.tmpl | 6 +-- 9 files changed, 110 insertions(+), 29 deletions(-) diff --git a/models/issue.go b/models/issue.go index fed7389f2ebb0..1723e29cd5cea 100644 --- a/models/issue.go +++ b/models/issue.go @@ -915,6 +915,7 @@ type NewIssueOptions struct { Repo *Repository Issue *Issue LabelIDs []int64 + AssigneeIDs []int64 Attachments []string // In UUID format. IsPull bool } @@ -948,6 +949,20 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } + // Check for and validate assignees + var validAssigneeIDs [] int64 + if len(opts.AssigneeIDs) > 0 { + for _, assigneeID := range opts.AssigneeIDs { + valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite) + if err != nil { + return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assigneeID, opts.Repo.ID, err) + } + if valid { + validAssigneeIDs = append(validAssigneeIDs, assigneeID) + } + } + } + // Milestone and assignee validation should happen before insert actual object. if _, err = e.Insert(opts.Issue); err != nil { return err @@ -967,6 +982,20 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { return err } }*/ + // Insert the assignees + if len(opts.AssigneeIDs) > 0 { + for _, assigneeID := range opts.AssigneeIDs { + err = opts.Issue.ChangeAssignee(doer, assigneeID) + if err != nil { + // Irgendwo hier passiert der Fehler, warscheinlich durch die neueröffnete session + // in einer von den unterfunktionen. Denkbar wäre das adden in ne seperate funktion + // auszulagern, die dann den ganzen anderen Kram regelt (issuecomment, hooks etc) + // Bzw. den ganzen müll mit "ChangeAssignee" vernünftig zu machen + fmt.Println(err, assigneeID, opts.Issue.ID) + return err + } + } + } if opts.IsPull { _, err = e.Exec("UPDATE `repository` SET num_pulls = num_pulls + 1 WHERE id = ?", opts.Issue.RepoID) @@ -1023,7 +1052,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } // NewIssue creates new issue with labels for repository. -func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string) (err error) { +func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, assigneeIDs []int64, uuids []string) (err error) { sess := x.NewSession() defer sess.Close() if err = sess.Begin(); err != nil { @@ -1035,6 +1064,7 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string) Issue: issue, LabelIDs: labelIDs, Attachments: uuids, + AssigneeIDs: assigneeIDs, }); err != nil { return fmt.Errorf("newIssue: %v", err) } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 634274c4e88ed..73de0fb14251b 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -248,6 +248,7 @@ func (f *NewDingtalkHookForm) Validate(ctx *macaron.Context, errs binding.Errors type CreateIssueForm struct { Title string `binding:"Required;MaxSize(255)"` LabelIDs string `form:"label_ids"` + AssigneeIDs string `form:"assignee_ids"` Ref string `form:"ref"` MilestoneID int64 AssigneeID int64 diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ef28f91283029..baa43b61c33de 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -620,8 +620,8 @@ issues.new.no_milestone = No Milestone issues.new.clear_milestone = Clear milestone issues.new.open_milestone = Open Milestones issues.new.closed_milestone = Closed Milestones -issues.new.assignee = Assignee -issues.new.clear_assignee = Clear assignee +issues.new.assignees = Assignees +issues.new.clear_assignees = Clear assignees issues.new.no_assignees = Nobody assigned issues.no_ref = No Branch/Tag Specified issues.create = Create Issue diff --git a/public/js/index.js b/public/js/index.js index af008ecdd5a93..2f7465e5adb04 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -192,10 +192,10 @@ function initCommentForm() { } }); - $listMenu.find('.item:not(.no-select)').click(function () { - if (selector == 'select-assignees') { + // we don't need the action attribute when updating assignees + if (selector == 'select-assignees' && hasLabelUpdateAction) { updateIssuesMeta( $listMenu.data('update-url'), "", diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 2bdea7a4168df..49afb973e49b4 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -166,7 +166,8 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { form.Labels = nil } - if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil); err != nil { + // TODO + if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil, nil); err != nil { ctx.Error(500, "NewIssue", err) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3294091dc3d56..37c918f11eb08 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -364,7 +364,7 @@ func NewIssue(ctx *context.Context) { } // ValidateRepoMetas check and returns repository's meta informations -func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64, int64, int64) { +func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64, []int64, int64) { var ( repo = ctx.Repo.Repository err error @@ -372,11 +372,11 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 labels := RetrieveRepoMetas(ctx, ctx.Repo.Repository) if ctx.Written() { - return nil, 0, 0 + return nil, nil, 0 } if !ctx.Repo.IsWriter() { - return nil, 0, 0 + return nil, nil, 0 } var labelIDs []int64 @@ -385,7 +385,7 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 if len(form.LabelIDs) > 0 { labelIDs, err = base.StringsToInt64s(strings.Split(form.LabelIDs, ",")) if err != nil { - return nil, 0, 0 + return nil, nil, 0 } labelIDMark := base.Int64sToMap(labelIDs) @@ -407,23 +407,41 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 ctx.Data["Milestone"], err = repo.GetMilestoneByID(milestoneID) if err != nil { ctx.ServerError("GetMilestoneByID", err) - return nil, 0, 0 + return nil, nil, 0 } ctx.Data["milestone_id"] = milestoneID } // Check assignee. - assigneeID := form.AssigneeID + /*assigneeID := form.AssigneeID if assigneeID > 0 { ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID) if err != nil { ctx.ServerError("GetAssigneeByID", err) - return nil, 0, 0 + return nil, nil, 0, 0 } ctx.Data["assignee_id"] = assigneeID - } + }*/ + + // Check assignees + var assigneeIDs []int64 + if len(form.AssigneeIDs) > 0 { + assigneeIDs, err = base.StringsToInt64s(strings.Split(form.AssigneeIDs, ",")) + if err != nil { + return nil, nil, 0 + } + //assigneeIDMark := base.Int64sToMap(assigneeIDs) - return labelIDs, milestoneID, assigneeID + // Check if the passed assignees actually exist + for _, aID := range assigneeIDs { + _, err = repo.GetAssigneeByID(aID) + if err != nil { + ctx.ServerError("GetAssigneeByID", err) + return nil, nil, 0 + } + } + } + return labelIDs, assigneeIDs, milestoneID } // NewIssuePost response for creating new issue @@ -440,7 +458,7 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { attachments []string ) - labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form) + labelIDs, assigneeIDs, milestoneID := ValidateRepoMetas(ctx, form) if ctx.Written() { return } @@ -460,11 +478,10 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, - AssigneeID: assigneeID, Content: form.Content, Ref: form.Ref, } - if err := models.NewIssue(repo, issue, labelIDs, attachments); err != nil { + if err := models.NewIssue(repo, issue, labelIDs, assigneeIDs, attachments); err != nil { ctx.ServerError("NewIssue", err) return } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index a852cee1f300b..a9783600051bf 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -775,7 +775,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) return } - labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form) + // TODO + labelIDs, _, milestoneID := ValidateRepoMetas(ctx, form) if ctx.Written() { return } @@ -811,7 +812,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, - AssigneeID: assigneeID, + //AssigneeID: assigneeID, IsPull: true, Content: form.Content, } @@ -828,6 +829,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) } // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. + + // TODO if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { ctx.ServerError("NewPullRequest", err) return diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2e3c777d53ee5..92b0d73696f50 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -97,27 +97,56 @@
- + +
+ + {{.i18n.Tr "repo.issues.new.assignees"}} + + +
+
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
+ {{range .Assignees}} + + + + {{.Name}} + + + {{end}} +
+
+
+ + {{.i18n.Tr "repo.issues.new.no_assignees"}} + + {{range .Assignees}} + +  {{.Name}} + + {{end}} +
+ +
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 6af84a95b811f..b1b0e62dc0b9f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -69,11 +69,11 @@
- {{.i18n.Tr "repo.issues.new.assignee"}} + {{.i18n.Tr "repo.issues.new.assignees"}}
-
{{.i18n.Tr "repo.issues.new.clear_assignee"}}
+
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} {{/* {{if .IsChecked}}checked{{end}} @@ -84,7 +84,7 @@
- {{.i18n.Tr "repo.issues.new.no_assignee"}} + {{.i18n.Tr "repo.issues.new.no_assignees"}}
{{range .Issue.Assignees}}  {{.Name}} From 6583569dae63aeb76f0c7120527328ba9042fb05 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Mar 2018 00:42:45 +0100 Subject: [PATCH 07/83] fmt --- models/issue.go | 4 ++-- models/issue_user.go | 12 ++++++------ models/migrations/v58.go | 6 +++--- modules/auth/repo_form.go | 2 +- routers/repo/pull.go | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/models/issue.go b/models/issue.go index 1723e29cd5cea..7569fbaa37947 100644 --- a/models/issue.go +++ b/models/issue.go @@ -179,7 +179,7 @@ func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error } func ClearAssigneesByIssue(issue *Issue) (err error) { - _, err = x.Delete(IssueAssignees{IssueID:issue.ID}) + _, err = x.Delete(IssueAssignees{IssueID: issue.ID}) if err != nil { return err } @@ -950,7 +950,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } // Check for and validate assignees - var validAssigneeIDs [] int64 + var validAssigneeIDs []int64 if len(opts.AssigneeIDs) > 0 { for _, assigneeID := range opts.AssigneeIDs { valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite) diff --git a/models/issue_user.go b/models/issue_user.go index 7d7cdb0d3cf5a..8e649f081be74 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -10,10 +10,10 @@ import ( // IssueUser represents an issue-user relation. type IssueUser struct { - ID int64 `xorm:"pk autoincr"` - UID int64 `xorm:"INDEX"` // User ID. - IssueID int64 - IsRead bool + ID int64 `xorm:"pk autoincr"` + UID int64 `xorm:"INDEX"` // User ID. + IssueID int64 + IsRead bool //IsAssigned bool IsMentioned bool } @@ -32,8 +32,8 @@ func newIssueUsers(e Engine, repo *Repository, issue *Issue) error { issueUsers := make([]*IssueUser, 0, len(assignees)+1) for _, assignee := range assignees { issueUsers = append(issueUsers, &IssueUser{ - IssueID: issue.ID, - UID: assignee.ID, + IssueID: issue.ID, + UID: assignee.ID, //IsAssigned: assignee.ID == issue.AssigneeID, }) isPosterAssignee = isPosterAssignee || assignee.ID == issue.PosterID diff --git a/models/migrations/v58.go b/models/migrations/v58.go index 50e97e3b18aeb..237cde3915f3c 100644 --- a/models/migrations/v58.go +++ b/models/migrations/v58.go @@ -7,8 +7,8 @@ package migrations import ( "code.gitea.io/gitea/models" - "github.com/go-xorm/xorm" "code.gitea.io/gitea/modules/util" + "github.com/go-xorm/xorm" ) func addMultipleAssignees(x *xorm.Engine) error { @@ -73,7 +73,7 @@ func addMultipleAssignees(x *xorm.Engine) error { // Migrate comments // First update everything to not have nulls in db - _, err = x.Where("type = ?", 9).Update(Comment{RemovedAssignee:false}) + _, err = x.Where("type = ?", 9).Update(Comment{RemovedAssignee: false}) allAssignementComments := []Comment{} err = x.Where("type = ?", 9).Find(&allAssignementComments) @@ -81,7 +81,7 @@ func addMultipleAssignees(x *xorm.Engine) error { for _, comment := range allAssignementComments { // Everytime where OldAssigneeID is > 0, the assignement was removed. if comment.OldAssigneeID > 0 { - _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee:true}) + _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee: true}) } } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 73de0fb14251b..24d27506cd1c1 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -248,7 +248,7 @@ func (f *NewDingtalkHookForm) Validate(ctx *macaron.Context, errs binding.Errors type CreateIssueForm struct { Title string `binding:"Required;MaxSize(255)"` LabelIDs string `form:"label_ids"` - AssigneeIDs string `form:"assignee_ids"` + AssigneeIDs string `form:"assignee_ids"` Ref string `form:"ref"` MilestoneID int64 AssigneeID int64 diff --git a/routers/repo/pull.go b/routers/repo/pull.go index a9783600051bf..d22730c48c0b3 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -813,8 +813,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) Poster: ctx.User, MilestoneID: milestoneID, //AssigneeID: assigneeID, - IsPull: true, - Content: form.Content, + IsPull: true, + Content: form.Content, } pullRequest := &models.PullRequest{ HeadRepoID: headRepo.ID, From a0bf332716c005680ca56ef7b3f51f84137587c3 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Mar 2018 23:41:35 +0100 Subject: [PATCH 08/83] Made adding assignees work when creating an issue --- models/issue.go | 34 +++++++++++++++------------------- models/issue_user.go | 25 ++++++++----------------- 2 files changed, 23 insertions(+), 36 deletions(-) diff --git a/models/issue.go b/models/issue.go index 7569fbaa37947..a5d402ff79364 100644 --- a/models/issue.go +++ b/models/issue.go @@ -854,30 +854,30 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { // ChangeAssignee changes the Assignee field of this issue. func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { - removed, err := UpdateIssueUserByAssignees(issue, assigneeID) + sess := x.NewSession() + defer sess.Close() + + return issue.changeAssignee(sess, doer, assigneeID) +} + +func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64) (err error) { + + // Update the assignee + removed, err := updateIssueAssignee(sess, issue, assigneeID) if err != nil { return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) } - sess := x.NewSession() - defer sess.Close() - + // Repo infos if err = issue.loadRepo(sess); err != nil { return fmt.Errorf("loadRepo: %v", err) } + // Comment if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, assigneeID, removed); err != nil { return fmt.Errorf("createAssigneeComment: %v", err) } - /*issue.Assignee, err = GetUserByID(issue.AssigneeID) - if err != nil && !IsErrUserNotExist(err) { - log.Error(4, "GetUserByID [assignee_id: %v]: %v", issue.AssigneeID, err) - return nil - }*/ - - // Error not nil here means user does not exist, which is remove assignee. - isRemoveAssignee := err != nil if issue.IsPull { issue.PullRequest.Issue = issue apiPullRequest := &api.PullRequestPayload{ @@ -886,13 +886,13 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { Repository: issue.Repo.APIFormat(AccessModeNone), Sender: doer.APIFormat(), } - if isRemoveAssignee { + if removed { apiPullRequest.Action = api.HookIssueUnassigned } else { apiPullRequest.Action = api.HookIssueAssigned } if err := PrepareWebhooks(issue.Repo, HookEventPullRequest, apiPullRequest); err != nil { - log.Error(4, "PrepareWebhooks [is_pull: %v, remove_assignee: %v]: %v", issue.IsPull, isRemoveAssignee, err) + log.Error(4, "PrepareWebhooks [is_pull: %v, remove_assignee: %v]: %v", issue.IsPull, removed, err) return nil } } @@ -985,12 +985,8 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { // Insert the assignees if len(opts.AssigneeIDs) > 0 { for _, assigneeID := range opts.AssigneeIDs { - err = opts.Issue.ChangeAssignee(doer, assigneeID) + err = opts.Issue.changeAssignee(e, doer, assigneeID) if err != nil { - // Irgendwo hier passiert der Fehler, warscheinlich durch die neueröffnete session - // in einer von den unterfunktionen. Denkbar wäre das adden in ne seperate funktion - // auszulagern, die dann den ganzen anderen Kram regelt (issuecomment, hooks etc) - // Bzw. den ganzen müll mit "ChangeAssignee" vernünftig zu machen fmt.Println(err, assigneeID, opts.Issue.ID) return err } diff --git a/models/issue_user.go b/models/issue_user.go index 8e649f081be74..4470ed94712e6 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -6,6 +6,7 @@ package models import ( "fmt" + "github.com/go-xorm/xorm" ) // IssueUser represents an issue-user relation. @@ -51,7 +52,13 @@ func newIssueUsers(e Engine, repo *Repository, issue *Issue) error { return nil } -func updateIssueAssignees(e Engine, issue *Issue, assigneeID int64) (removed bool, err error) { +func updateIssueAssignee(e *xorm.Session, issue *Issue, assigneeID int64) (removed bool, err error) { + + // Check if the user exists + _, err = GetUserByID(assigneeID) + if err != nil { + return false, err + } // Check if the submitted user is already assigne, if yes delete him otherwise add him var toBeDeleted bool @@ -108,22 +115,6 @@ func UpdateIssueUserByAssignee(issue *Issue) (err error) { return sess.Commit() } -// UpdateIssueUserByAssignee updates issue-user relation for assignee. -func UpdateIssueUserByAssignees(issue *Issue, assigneeID int64) (removed bool, err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return false, err - } - - removed, err = updateIssueAssignees(sess, issue, assigneeID) - if err != nil { - return removed, err - } - - return removed, sess.Commit() -} - // UpdateIssueUserByRead updates issue-user relation for reading. func UpdateIssueUserByRead(uid, issueID int64) error { _, err := x.Exec("UPDATE `issue_user` SET is_read=? WHERE uid=? AND issue_id=?", true, uid, issueID) From cf6d9d30205a0b2b6d14ac0135d4dd2eae2691d7 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Mar 2018 23:49:50 +0100 Subject: [PATCH 09/83] cleanup --- models/issue.go | 9 --------- models/issue_user.go | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/models/issue.go b/models/issue.go index a5d402ff79364..ef68c8a94c98e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -974,20 +974,11 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } - /*if opts.Issue.AssigneeID > 0 { - if err = opts.Issue.loadRepo(e); err != nil { - return err - } - if _, err = createAssigneeComment(e, doer, opts.Issue.Repo, opts.Issue, -1, opts.Issue.AssigneeID); err != nil { - return err - } - }*/ // Insert the assignees if len(opts.AssigneeIDs) > 0 { for _, assigneeID := range opts.AssigneeIDs { err = opts.Issue.changeAssignee(e, doer, assigneeID) if err != nil { - fmt.Println(err, assigneeID, opts.Issue.ID) return err } } diff --git a/models/issue_user.go b/models/issue_user.go index 4470ed94712e6..acd47418b4a86 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -85,6 +85,7 @@ func updateIssueAssignee(e *xorm.Session, issue *Issue, assigneeID int64) (remov return toBeDeleted, nil } +// What is this good for?? Saving who interacted whith which issue? func updateIssueUserByAssignee(e Engine, issue *Issue) (err error) { if _, err = e.Exec("UPDATE `issue_user` SET is_assigned = ? WHERE issue_id = ?", false, issue.ID); err != nil { return err From df4dc8d677b1e492a757d684cf7ff8e4d3dff975 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Mar 2018 23:59:45 +0100 Subject: [PATCH 10/83] When viewing issues or prs via the api, assignees are now shown correcctly --- models/issue.go | 2 +- models/pull.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/models/issue.go b/models/issue.go index ef68c8a94c98e..f0278413bce17 100644 --- a/models/issue.go +++ b/models/issue.go @@ -389,7 +389,7 @@ func (issue *Issue) APIFormat() *api.Issue { for _, assignee := range issue.Assignees { apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat()) } - //apiIssue.Assignee = issue.Assignee.APIFormat() + apiIssue.Assignee = issue.Assignee.APIFormat() } if issue.IsPull { apiIssue.PullRequest = &api.PullRequestMeta{ diff --git a/models/pull.go b/models/pull.go index 2d5319cc720c7..40d02a6d56545 100644 --- a/models/pull.go +++ b/models/pull.go @@ -197,6 +197,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { Body: apiIssue.Body, Labels: apiIssue.Labels, Milestone: apiIssue.Milestone, + Assignee: apiIssue.Assignee, Assignees: apiIssue.Assignees, State: apiIssue.State, Comments: apiIssue.Comments, From 2c883747fc2e858539dc0bb1a836cf45f6e2d03d Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 7 Mar 2018 23:36:51 +0100 Subject: [PATCH 11/83] Added assignee things when adding/updating an issue/pr via the api --- models/issue.go | 10 +++- public/swagger.v1.json | 103 +++++++++++++++++++++++++++++++++++ routers/api/v1/repo/issue.go | 71 +++++++++++++++--------- routers/repo/pull.go | 1 - 4 files changed, 156 insertions(+), 29 deletions(-) diff --git a/models/issue.go b/models/issue.go index f0278413bce17..3382b90bb9c5d 100644 --- a/models/issue.go +++ b/models/issue.go @@ -852,7 +852,11 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { return nil } -// ChangeAssignee changes the Assignee field of this issue. +func UpdateAssignee(issue *Issue, doer *User, assigneeID int64) (err error) { + return issue.ChangeAssignee(doer, assigneeID) +} + +// ChangeAssignee changes the Assignee of this issue. func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { sess := x.NewSession() defer sess.Close() @@ -938,7 +942,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } - if assigneeID := opts.Issue.AssigneeID; assigneeID > 0 { + /*if assigneeID := opts.Issue.AssigneeID; assigneeID > 0 { valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite) if err != nil { return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assigneeID, opts.Repo.ID, err) @@ -947,7 +951,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { opts.Issue.AssigneeID = 0 opts.Issue.Assignee = nil } - } + }*/ // Check for and validate assignees var validAssigneeIDs []int64 diff --git a/public/swagger.v1.json b/public/swagger.v1.json index cc918e015a3fa..233d1cd395fe3 100644 --- a/public/swagger.v1.json +++ b/public/swagger.v1.json @@ -3225,6 +3225,37 @@ }, "/repos/{owner}/{repo}/releases": { "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "List a repo's releases", + "operationId": "repoListReleases", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "$ref": "#/responses/ReleaseList" + } + } + }, + "post": { "consumes": [ "application/json" ], @@ -4994,6 +5025,45 @@ }, "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea" }, + "Attachment": { + "description": "Attachment a generic attachment", + "type": "object", + "properties": { + "browser_download_url": { + "type": "string", + "x-go-name": "DownloadURL" + }, + "created_at": { + "type": "string", + "format": "date-time", + "x-go-name": "Created" + }, + "download_count": { + "type": "integer", + "format": "int64", + "x-go-name": "DownloadCount" + }, + "id": { + "type": "integer", + "format": "int64", + "x-go-name": "ID" + }, + "name": { + "type": "string", + "x-go-name": "Name" + }, + "size": { + "type": "integer", + "format": "int64", + "x-go-name": "Size" + }, + "uuid": { + "type": "string", + "x-go-name": "UUID" + } + }, + "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea" + }, "Branch": { "description": "Branch represents a repository branch", "type": "object", @@ -5158,6 +5228,13 @@ "type": "string", "x-go-name": "Assignee" }, + "assignees": { + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "Assignees" + }, "body": { "type": "string", "x-go-name": "Body" @@ -5202,6 +5279,11 @@ "uniqueItems": true, "x-go-name": "Key" }, + "read_only": { + "description": "Describe if the key has only read access or read/write", + "type": "boolean", + "x-go-name": "ReadOnly" + }, "title": { "description": "Title of the key to add", "type": "string", @@ -5930,6 +6012,13 @@ "assignee": { "$ref": "#/definitions/User" }, + "assignees": { + "type": "array", + "items": { + "$ref": "#/definitions/User" + }, + "x-go-name": "Assignees" + }, "body": { "type": "string", "x-go-name": "Body" @@ -6341,6 +6430,13 @@ "assignee": { "$ref": "#/definitions/User" }, + "assignees": { + "type": "array", + "items": { + "$ref": "#/definitions/User" + }, + "x-go-name": "Assignees" + }, "base": { "$ref": "#/definitions/PRBranchInfo" }, @@ -6459,6 +6555,13 @@ "description": "Release represents a repository release", "type": "object", "properties": { + "assets": { + "type": "array", + "items": { + "$ref": "#/definitions/Attachment" + }, + "x-go-name": "Attachments" + }, "author": { "$ref": "#/definitions/User" }, diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 49afb973e49b4..0c7c90f2d3a60 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -2,11 +2,14 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package repo import ( "fmt" - "strings" api "code.gitea.io/sdk/gitea" @@ -149,17 +152,22 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { } if ctx.Repo.IsWriter() { - if len(form.Assignee) > 0 { - assignee, err := models.GetUserByName(form.Assignee) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) + if len(form.Assignees) > 0 { + for _, assigneeName := range form.Assignees { + assignee, err := models.GetUserByName(assigneeName) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) + } else { + ctx.Error(500, "GetUserByName", err) + } + return } - return + + // update + models.UpdateAssignee(issue, ctx.User, assignee.ID) + //issue.Assignees = append(issue.Assignees, user) } - issue.AssigneeID = assignee.ID } issue.MilestoneID = form.Milestone } else { @@ -243,28 +251,41 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { issue.Content = *form.Body } - // This is the thing to add asignees. TODO - if ctx.Repo.IsWriter() && form.Assignee != nil && - (issue.Assignee == nil || issue.Assignee.LowerName != strings.ToLower(*form.Assignee)) { - if len(*form.Assignee) == 0 { - issue.AssigneeID = 0 + // Add/delete assignees + // TODO: How to delete an assignee the way we're currently doing it? + if ctx.Repo.IsWriter() && form.Assignees != nil { + if len(form.Assignees) == 0 { + issue.Assignees = []*models.User{} } else { - assignee, err := models.GetUserByName(*form.Assignee) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) + for _, assigneeName := range form.Assignees { + assignee, err := models.GetUserByName(assigneeName) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee)) + } else { + ctx.Error(500, "GetUserByName", err) + } + return + } + + // Only add if the user isn't already assigned + isAssigned, err := models.IsUserAssignedToIssue(issue, assignee) + if err != nil { + ctx.Error(500, "CheckIfUserIsAssigned", err) + return + } + if !isAssigned { + models.UpdateAssignee(issue, ctx.User, assignee.ID) + //issue.Assignees = append(issue.Assignees, assignee) } - return } - issue.AssigneeID = assignee.ID + } - if err = models.UpdateIssueUserByAssignee(issue); err != nil { + /*if err = models.UpdateIssueUserByAssignee(issue); err != nil { ctx.Error(500, "UpdateIssueUserByAssignee", err) return - } + }*/ } if ctx.Repo.IsWriter() && form.Milestone != nil && issue.MilestoneID != *form.Milestone { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index d22730c48c0b3..7134bdddaac53 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -830,7 +830,6 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. - // TODO if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { ctx.ServerError("NewPullRequest", err) return From fa0f91895b5a75eb429d7f822ccc38f201777a28 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 16:33:02 +0100 Subject: [PATCH 12/83] Issue assignees now recive notifications --- models/issue.go | 11 ----------- models/issue_assignees.go | 1 + models/issue_mail.go | 11 +++++++++-- 3 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 models/issue_assignees.go diff --git a/models/issue.go b/models/issue.go index 3382b90bb9c5d..f7f59bfc2b4fe 100644 --- a/models/issue.go +++ b/models/issue.go @@ -942,17 +942,6 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } - /*if assigneeID := opts.Issue.AssigneeID; assigneeID > 0 { - valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite) - if err != nil { - return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assigneeID, opts.Repo.ID, err) - } - if !valid { - opts.Issue.AssigneeID = 0 - opts.Issue.Assignee = nil - } - }*/ - // Check for and validate assignees var validAssigneeIDs []int64 if len(opts.AssigneeIDs) > 0 { diff --git a/models/issue_assignees.go b/models/issue_assignees.go new file mode 100644 index 0000000000000..2640e7f93eab1 --- /dev/null +++ b/models/issue_assignees.go @@ -0,0 +1 @@ +package models diff --git a/models/issue_mail.go b/models/issue_mail.go index 08e4eed584df8..cf17ea4e092fa 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -47,8 +47,15 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content } // Assignee must receive any communications - if issue.Assignee != nil && issue.AssigneeID > 0 && issue.AssigneeID != doer.ID { - participants = append(participants, issue.Assignee) + assignees, err := GetAssigneesByIssue(issue) + if err != nil { + return err + } + + for _, assignee := range assignees { + if assignee.ID != doer.ID { + participants = append(participants, issue.Assignee) + } } tos := make([]string, 0, len(watchers)) // List of email addresses. From 8a57bba6eeb3afa28cfd59990a43405176a3afd2 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 16:46:06 +0100 Subject: [PATCH 13/83] Cleanup --- models/issue.go | 128 ---------------------------------- models/issue_assignees.go | 142 ++++++++++++++++++++++++++++++++++++++ models/issue_mail.go | 2 +- models/issue_user.go | 31 --------- 4 files changed, 143 insertions(+), 160 deletions(-) diff --git a/models/issue.go b/models/issue.go index f7f59bfc2b4fe..e80745d388c02 100644 --- a/models/issue.go +++ b/models/issue.go @@ -127,82 +127,6 @@ func (issue *Issue) loadPoster(e Engine) (err error) { return } -func (issue *Issue) loadAssignees(e Engine) (err error) { - var assigneeIDs []IssueAssignees - - err = e.Where("issue_id = ?", issue.ID).Find(&assigneeIDs) - if err != nil { - return - } - - for _, assignee := range assigneeIDs { - user, err := getUserByID(e, assignee.AssigneeID) - if err != nil { - user = NewGhostUser() - if !IsErrUserNotExist(err) { - return err - } - } - issue.Assignees = append(issue.Assignees, user) - } - - // Check if we have at least one assignee and if yes put it in as `Assignee` - if len(issue.Assignees) > 0 { - issue.Assignee = issue.Assignees[0] - } - - return -} - -func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { - err = issue.loadAssignees(x) - if err != nil { - return assignees, err - } - - return issue.Assignees, nil -} - -func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - err = issue.loadAssignees(x) - if err != nil { - return false, err - } - - for _, assignee := range issue.Assignees { - if assignee.ID == user.ID { - return true, nil - } - } - - return false, nil -} - -func ClearAssigneesByIssue(issue *Issue) (err error) { - _, err = x.Delete(IssueAssignees{IssueID: issue.ID}) - if err != nil { - return err - } - return nil -} - -// MakeAssigneeList concats a string with all names of the assignees. Useful for logs. -func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { - err = issue.loadAssignees(x) - if err != nil { - return "", err - } - - for in, assignee := range issue.Assignees { - AssigneeList += assignee.Name - - if len(issue.Assignees) > (in + 1) { - AssigneeList += ", " - } - } - return -} - func (issue *Issue) loadPullRequest(e Engine) (err error) { if issue.IsPull && issue.PullRequest == nil { issue.PullRequest, err = getPullRequestByIssueID(e, issue.ID) @@ -852,58 +776,6 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { return nil } -func UpdateAssignee(issue *Issue, doer *User, assigneeID int64) (err error) { - return issue.ChangeAssignee(doer, assigneeID) -} - -// ChangeAssignee changes the Assignee of this issue. -func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { - sess := x.NewSession() - defer sess.Close() - - return issue.changeAssignee(sess, doer, assigneeID) -} - -func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64) (err error) { - - // Update the assignee - removed, err := updateIssueAssignee(sess, issue, assigneeID) - if err != nil { - return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) - } - - // Repo infos - if err = issue.loadRepo(sess); err != nil { - return fmt.Errorf("loadRepo: %v", err) - } - - // Comment - if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, assigneeID, removed); err != nil { - return fmt.Errorf("createAssigneeComment: %v", err) - } - - if issue.IsPull { - issue.PullRequest.Issue = issue - apiPullRequest := &api.PullRequestPayload{ - Index: issue.Index, - PullRequest: issue.PullRequest.APIFormat(), - Repository: issue.Repo.APIFormat(AccessModeNone), - Sender: doer.APIFormat(), - } - if removed { - apiPullRequest.Action = api.HookIssueUnassigned - } else { - apiPullRequest.Action = api.HookIssueAssigned - } - if err := PrepareWebhooks(issue.Repo, HookEventPullRequest, apiPullRequest); err != nil { - log.Error(4, "PrepareWebhooks [is_pull: %v, remove_assignee: %v]: %v", issue.IsPull, removed, err) - return nil - } - } - go HookQueue.Add(issue.RepoID) - return nil -} - // GetTasks returns the amount of tasks in the issues content func (issue *Issue) GetTasks() int { return len(issueTasksPat.FindAllStringIndex(issue.Content, -1)) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 2640e7f93eab1..f784323687376 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -1 +1,143 @@ package models + +import ( + "fmt" + + "code.gitea.io/gitea/modules/log" + api "code.gitea.io/sdk/gitea" + + "github.com/go-xorm/xorm" +) + +// This loads all assignees of an issue +func (issue *Issue) loadAssignees(e Engine) (err error) { + var assigneeIDs []IssueAssignees + + err = e.Where("issue_id = ?", issue.ID).Find(&assigneeIDs) + if err != nil { + return + } + + for _, assignee := range assigneeIDs { + user, err := getUserByID(e, assignee.AssigneeID) + if err != nil { + user = NewGhostUser() + if !IsErrUserNotExist(err) { + return err + } + } + issue.Assignees = append(issue.Assignees, user) + } + + // Check if we have at least one assignee and if yes put it in as `Assignee` + if len(issue.Assignees) > 0 { + issue.Assignee = issue.Assignees[0] + } + + return +} + +// GetAssigneesByIssue returns everyone assigned to that issue +func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { + err = issue.loadAssignees(x) + if err != nil { + return assignees, err + } + + return issue.Assignees, nil +} + +// IsUserAssignedToIssue returns true when the user is assigned to the issue +func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { + err = issue.loadAssignees(x) + if err != nil { + return false, err + } + + for _, assignee := range issue.Assignees { + if assignee.ID == user.ID { + return true, nil + } + } + + return false, nil +} + +// ClearAssigneesByIssue deletes all assignees for one issue +func ClearAssigneesByIssue(issue *Issue) (err error) { + _, err = x.Delete(IssueAssignees{IssueID: issue.ID}) + if err != nil { + return err + } + return nil +} + +// MakeAssigneeList concats a string with all names of the assignees. Useful for logs. +func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { + err = issue.loadAssignees(x) + if err != nil { + return "", err + } + + for in, assignee := range issue.Assignees { + AssigneeList += assignee.Name + + if len(issue.Assignees) > (in + 1) { + AssigneeList += ", " + } + } + return +} + +// UpdateAssignee deletes or adds an assignee to an issue +func UpdateAssignee(issue *Issue, doer *User, assigneeID int64) (err error) { + return issue.ChangeAssignee(doer, assigneeID) +} + +// ChangeAssignee changes the Assignee of this issue. +func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { + sess := x.NewSession() + defer sess.Close() + + return issue.changeAssignee(sess, doer, assigneeID) +} + +func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64) (err error) { + + // Update the assignee + removed, err := updateIssueAssignee(sess, issue, assigneeID) + if err != nil { + return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) + } + + // Repo infos + if err = issue.loadRepo(sess); err != nil { + return fmt.Errorf("loadRepo: %v", err) + } + + // Comment + if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, assigneeID, removed); err != nil { + return fmt.Errorf("createAssigneeComment: %v", err) + } + + if issue.IsPull { + issue.PullRequest.Issue = issue + apiPullRequest := &api.PullRequestPayload{ + Index: issue.Index, + PullRequest: issue.PullRequest.APIFormat(), + Repository: issue.Repo.APIFormat(AccessModeNone), + Sender: doer.APIFormat(), + } + if removed { + apiPullRequest.Action = api.HookIssueUnassigned + } else { + apiPullRequest.Action = api.HookIssueAssigned + } + if err := PrepareWebhooks(issue.Repo, HookEventPullRequest, apiPullRequest); err != nil { + log.Error(4, "PrepareWebhooks [is_pull: %v, remove_assignee: %v]: %v", issue.IsPull, removed, err) + return nil + } + } + go HookQueue.Add(issue.RepoID) + return nil +} diff --git a/models/issue_mail.go b/models/issue_mail.go index cf17ea4e092fa..c4737e89ff2e1 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -47,7 +47,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content } // Assignee must receive any communications - assignees, err := GetAssigneesByIssue(issue) + assignees, err := GetAssigneesByIssue(issue) if err != nil { return err } diff --git a/models/issue_user.go b/models/issue_user.go index acd47418b4a86..3c9fdd059331b 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -85,37 +85,6 @@ func updateIssueAssignee(e *xorm.Session, issue *Issue, assigneeID int64) (remov return toBeDeleted, nil } -// What is this good for?? Saving who interacted whith which issue? -func updateIssueUserByAssignee(e Engine, issue *Issue) (err error) { - if _, err = e.Exec("UPDATE `issue_user` SET is_assigned = ? WHERE issue_id = ?", false, issue.ID); err != nil { - return err - } - - // Assignee ID equals to 0 means clear assignee. - if issue.AssigneeID > 0 { - if _, err = e.Exec("UPDATE `issue_user` SET is_assigned = ? WHERE uid = ? AND issue_id = ?", true, issue.AssigneeID, issue.ID); err != nil { - return err - } - } - - return updateIssue(e, issue) -} - -// UpdateIssueUserByAssignee updates issue-user relation for assignee. -func UpdateIssueUserByAssignee(issue *Issue) (err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } - - if err = updateIssueUserByAssignee(sess, issue); err != nil { - return err - } - - return sess.Commit() -} - // UpdateIssueUserByRead updates issue-user relation for reading. func UpdateIssueUserByRead(uid, issueID int64) error { _, err := x.Exec("UPDATE `issue_user` SET is_read=? WHERE uid=? AND issue_id=?", true, uid, issueID) From 3f525e0b8d96b62ebde32f660c5c4cbc60279341 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 16:58:31 +0100 Subject: [PATCH 14/83] Added checking for assignees to timetracking --- modules/context/repo.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index f3ae33cb50313..1fe5482ce1a3a 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -99,8 +99,9 @@ func (r *Repository) CanUseTimetracker(issue *models.Issue, user *models.User) b // Checking for following: // 1. Is timetracker enabled // 2. Is the user a contributor, admin, poster or assignee and do the repository policies require this? + isAssigned, _ := models.IsUserAssignedToIssue(issue, user) return r.Repository.IsTimetrackerEnabled() && (!r.Repository.AllowOnlyContributorsToTrackTime() || - r.IsWriter() || issue.IsPoster(user.ID) || issue.AssigneeID == user.ID) + r.IsWriter() || issue.IsPoster(user.ID) || isAssigned) } // GetCommitsCount returns cached commit count for current view From 0dc735e0c58086359de5566b1556f1cd3066c02e Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 17:08:39 +0100 Subject: [PATCH 15/83] Small fixes and improvements --- models/issue.go | 2 +- models/issue_comment.go | 2 +- models/issue_mail.go | 2 +- routers/api/v1/repo/pull.go | 6 +----- routers/repo/issue.go | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/models/issue.go b/models/issue.go index e80745d388c02..9e190c254c961 100644 --- a/models/issue.go +++ b/models/issue.go @@ -313,7 +313,7 @@ func (issue *Issue) APIFormat() *api.Issue { for _, assignee := range issue.Assignees { apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat()) } - apiIssue.Assignee = issue.Assignee.APIFormat() + apiIssue.Assignee = issue.Assignees[0].APIFormat() // For compatibily, we're keeping the first assignee as `apiIssue.Assignee` } if issue.IsPull { apiIssue.PullRequest = &api.PullRequestMeta{ diff --git a/models/issue_comment.go b/models/issue_comment.go index 76aa51224da13..952dc88eb16c7 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -241,7 +241,7 @@ func (c *Comment) LoadMilestone() error { } // LoadAssignees if comment.Type is CommentTypeAssignees, then load assignees -func (c *Comment) LoadAssignees() error { +func (c *Comment) LoadAssigneeUser() error { var err error if c.AssigneeID > 0 { diff --git a/models/issue_mail.go b/models/issue_mail.go index c4737e89ff2e1..b9b7f02bd9bf2 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -54,7 +54,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content for _, assignee := range assignees { if assignee.ID != doer.ID { - participants = append(participants, issue.Assignee) + participants = append(participants, assignee) } } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 742c0bccf9470..eff118595ae01 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -344,12 +344,8 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) { } issue.AssigneeID = assignee.ID } - - if err = models.UpdateIssueUserByAssignee(issue); err != nil { - ctx.Error(500, "UpdateIssueUserByAssignee", err) - return - } } + if ctx.Repo.IsWriter() && form.Milestone != 0 && issue.MilestoneID != form.Milestone { oldMilestoneID := issue.MilestoneID diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 37c918f11eb08..066b52a5cf0e5 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -719,7 +719,7 @@ func ViewIssue(ctx *context.Context) { comment.Milestone = ghostMilestone } } else if comment.Type == models.CommentTypeAssignees { - if err = comment.LoadAssignees(); err != nil { + if err = comment.LoadAssigneeUser(); err != nil { ctx.ServerError("LoadAssignees", err) return } From f302943f2a3f978ee35149c7f49637f59a2e893a Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 17:34:41 +0100 Subject: [PATCH 16/83] More small fixes and improvements --- models/issue_assignees.go | 10 ++++++++++ models/repo.go | 4 ++-- models/user.go | 2 +- routers/api/v1/repo/issue.go | 22 ++++++++++++++++------ routers/api/v1/repo/pull.go | 2 +- routers/repo/issue.go | 18 +++--------------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index f784323687376..dbdf1d0a9c95e 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -141,3 +141,13 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in go HookQueue.Add(issue.RepoID) return nil } + +func AddAssigneeByName(assigneeName string, issue *Issue, doer *User) (err error) { + assignee, err := GetUserByName(assigneeName) + if err != nil { + return + } + + // update + return UpdateAssignee(issue, doer, assignee.ID) +} diff --git a/models/repo.go b/models/repo.go index cddd57dc3839b..531662823fe4d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -555,8 +555,8 @@ func (repo *Repository) GetAssignees() (_ []*User, err error) { } // GetAssigneeByID returns the user that has write access of repository by given ID. -func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) { - return GetAssigneeByID(repo, userID) +func (repo *Repository) GetUserIfHasWriteAccess(userID int64) (*User, error) { + return GetUserIfHasWriteAccess(repo, userID) } // GetMilestoneByID returns the milestone belongs to repository by given ID. diff --git a/models/user.go b/models/user.go index fa41deec924f2..d6a7777283520 100644 --- a/models/user.go +++ b/models/user.go @@ -1109,7 +1109,7 @@ func GetUserByID(id int64) (*User, error) { } // GetAssigneeByID returns the user with write access of repository by given ID. -func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { +func GetUserIfHasWriteAccess(repo *Repository, userID int64) (*User, error) { has, err := HasAccess(userID, repo, AccessModeWrite) if err != nil { return nil, err diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index a3bb9b5c74cf3..45f76aa9d105c 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -10,6 +10,7 @@ package repo import ( "fmt" + "strings" api "code.gitea.io/sdk/gitea" @@ -177,27 +178,36 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { if ctx.Repo.IsWriter() { if len(form.Assignees) > 0 { for _, assigneeName := range form.Assignees { - assignee, err := models.GetUserByName(assigneeName) + err := models.AddAssigneeByName(assigneeName, issue, ctx.User) if err != nil { if models.IsErrUserNotExist(err) { ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) } else { - ctx.Error(500, "GetUserByName", err) + ctx.Error(500, "AddAssigneeByName", err) } return } + } + } - // update - models.UpdateAssignee(issue, ctx.User, assignee.ID) - //issue.Assignees = append(issue.Assignees, user) + // Keeping the old assigning method for compatibility reasons + if len(form.Assignee) > 0 { + err := models.AddAssigneeByName(form.Assignee, issue, ctx.User) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) + } else { + ctx.Error(500, "AddAssigneeByName", err) + } + return } } + issue.MilestoneID = form.Milestone } else { form.Labels = nil } - // TODO if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil, nil); err != nil { ctx.Error(500, "NewIssue", err) return diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index eff118595ae01..58b40a8bd8fe6 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -221,7 +221,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption return } - assignee, err := repo.GetAssigneeByID(assigneeUser.ID) + assignee, err := repo.GetUserIfHasWriteAccess(assigneeUser.ID) if err != nil { ctx.Error(500, "GetAssigneeByID", err) return diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 066b52a5cf0e5..62e286207240f 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -412,17 +412,6 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 ctx.Data["milestone_id"] = milestoneID } - // Check assignee. - /*assigneeID := form.AssigneeID - if assigneeID > 0 { - ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID) - if err != nil { - ctx.ServerError("GetAssigneeByID", err) - return nil, nil, 0, 0 - } - ctx.Data["assignee_id"] = assigneeID - }*/ - // Check assignees var assigneeIDs []int64 if len(form.AssigneeIDs) > 0 { @@ -430,13 +419,12 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 if err != nil { return nil, nil, 0 } - //assigneeIDMark := base.Int64sToMap(assigneeIDs) - // Check if the passed assignees actually exist + // Check if the passed assignees actually exists and has write access to the repo for _, aID := range assigneeIDs { - _, err = repo.GetAssigneeByID(aID) + _, err = repo.GetUserIfHasWriteAccess(aID) if err != nil { - ctx.ServerError("GetAssigneeByID", err) + ctx.ServerError("GetUserIfHasWriteAccess", err) return nil, nil, 0 } } From cb9d4d506eb02bcbbee8620aac8a90290a6df47f Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 17:42:12 +0100 Subject: [PATCH 17/83] Filtering by issue assignee works again --- models/issue.go | 3 ++- models/issue_user.go | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index 9e190c254c961..841e1523757dc 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1060,7 +1060,8 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) error { } if opts.AssigneeID > 0 { - sess.And("issue.assignee_id=?", opts.AssigneeID) + sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", opts.AssigneeID) } if opts.PosterID > 0 { diff --git a/models/issue_user.go b/models/issue_user.go index 3c9fdd059331b..302b9bd0a9c7b 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -35,7 +35,6 @@ func newIssueUsers(e Engine, repo *Repository, issue *Issue) error { issueUsers = append(issueUsers, &IssueUser{ IssueID: issue.ID, UID: assignee.ID, - //IsAssigned: assignee.ID == issue.AssigneeID, }) isPosterAssignee = isPosterAssignee || assignee.ID == issue.PosterID } From 4cdfea561ccd6d83ec0c7a9b1212aeee3a7784cf Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 17:49:22 +0100 Subject: [PATCH 18/83] Stats working again when filtering by assignee --- models/issue.go | 18 ++++++++++++------ vendor/code.gitea.io/sdk/gitea/issue.go | 3 +++ vendor/code.gitea.io/sdk/gitea/pull.go | 3 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/models/issue.go b/models/issue.go index 841e1523757dc..8744f3195f48b 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1283,7 +1283,8 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { } if opts.AssigneeID > 0 { - sess.And("issue.assignee_id = ?", opts.AssigneeID) + sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", opts.AssigneeID) } if opts.PosterID > 0 { @@ -1349,13 +1350,15 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { } case FilterModeAssign: stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false). - And("assignee_id = ?", opts.UserID). + Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", opts.UserID). Count(new(Issue)) if err != nil { return nil, err } stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true). - And("assignee_id = ?", opts.UserID). + Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", opts.UserID). Count(new(Issue)) if err != nil { return nil, err @@ -1377,7 +1380,8 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { cond = cond.And(builder.Eq{"issue.is_closed": opts.IsClosed}) stats.AssignCount, err = x.Where(cond). - And("assignee_id = ?", opts.UserID). + Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", opts.UserID). Count(new(Issue)) if err != nil { return nil, err @@ -1416,8 +1420,10 @@ func GetRepoIssueStats(repoID, uid int64, filterMode int, isPull bool) (numOpen switch filterMode { case FilterModeAssign: - openCountSession.And("assignee_id = ?", uid) - closedCountSession.And("assignee_id = ?", uid) + openCountSession.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", uid) + closedCountSession.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). + And("issue_assignees.assignee_id = ?", uid) case FilterModeCreate: openCountSession.And("poster_id = ?", uid) closedCountSession.And("poster_id = ?", uid) diff --git a/vendor/code.gitea.io/sdk/gitea/issue.go b/vendor/code.gitea.io/sdk/gitea/issue.go index 206c52a59e4ba..0b32115ed7871 100644 --- a/vendor/code.gitea.io/sdk/gitea/issue.go +++ b/vendor/code.gitea.io/sdk/gitea/issue.go @@ -39,6 +39,7 @@ type Issue struct { Labels []*Label `json:"labels"` Milestone *Milestone `json:"milestone"` Assignee *User `json:"assignee"` + Assignees []*User `json:"assignees"` // Whether the issue is open or closed // // type: string @@ -90,6 +91,7 @@ type CreateIssueOption struct { Body string `json:"body"` // username of assignee Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` // milestone id Milestone int64 `json:"milestone"` // list of label ids @@ -113,6 +115,7 @@ type EditIssueOption struct { Title string `json:"title"` Body *string `json:"body"` Assignee *string `json:"assignee"` + Assignees []string `json:"assignees"` Milestone *int64 `json:"milestone"` State *string `json:"state"` } diff --git a/vendor/code.gitea.io/sdk/gitea/pull.go b/vendor/code.gitea.io/sdk/gitea/pull.go index ee3fe116de7a2..70a4a6470b7b0 100644 --- a/vendor/code.gitea.io/sdk/gitea/pull.go +++ b/vendor/code.gitea.io/sdk/gitea/pull.go @@ -22,6 +22,7 @@ type PullRequest struct { Labels []*Label `json:"labels"` Milestone *Milestone `json:"milestone"` Assignee *User `json:"assignee"` + Assignees []*User `json:"assignees"` State StateType `json:"state"` Comments int `json:"comments"` @@ -84,6 +85,7 @@ type CreatePullRequestOption struct { Title string `json:"title" binding:"Required"` Body string `json:"body"` Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` Milestone int64 `json:"milestone"` Labels []int64 `json:"labels"` } @@ -104,6 +106,7 @@ type EditPullRequestOption struct { Title string `json:"title"` Body string `json:"body"` Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` Milestone int64 `json:"milestone"` Labels []int64 `json:"labels"` State *string `json:"state"` From be8d754d07a215e2475b2e6db364cfa3596420db Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 11 Mar 2018 23:23:38 +0100 Subject: [PATCH 19/83] Added old assigneeID when creating an issue/pr + re-added setting to add assignees when creating a pr --- models/issue.go | 5 +++++ models/issue_assignees.go | 2 +- models/pull.go | 3 ++- routers/api/v1/repo/issue.go | 6 +++++- routers/api/v1/repo/pull.go | 6 +++++- routers/repo/issue.go | 6 ++++++ routers/repo/pull.go | 6 ++---- 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/models/issue.go b/models/issue.go index 8744f3195f48b..fe051114ded0c 100644 --- a/models/issue.go +++ b/models/issue.go @@ -814,6 +814,11 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } + // Keep the old assignee id thingy for compatibility reasons + if opts.Issue.AssigneeID > 0 { + //opts.AssigneeIDs = append(opts.AssigneeIDs, opts.Issue.AssigneeID) + } + // Check for and validate assignees var validAssigneeIDs []int64 if len(opts.AssigneeIDs) > 0 { diff --git a/models/issue_assignees.go b/models/issue_assignees.go index dbdf1d0a9c95e..ad3ebf25f8ae4 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -121,7 +121,7 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in } if issue.IsPull { - issue.PullRequest.Issue = issue + issue.PullRequest = &PullRequest{Issue: issue} apiPullRequest := &api.PullRequestPayload{ Index: issue.Index, PullRequest: issue.PullRequest.APIFormat(), diff --git a/models/pull.go b/models/pull.go index 40d02a6d56545..7b4f5ced08018 100644 --- a/models/pull.go +++ b/models/pull.go @@ -690,7 +690,7 @@ func (pr *PullRequest) testPatch() (err error) { } // NewPullRequest creates new pull request with labels for repository. -func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) { +func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte, assigneeIDs []int64) (err error) { sess := x.NewSession() defer sess.Close() if err = sess.Begin(); err != nil { @@ -703,6 +703,7 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str LabelIDs: labelIDs, Attachments: uuids, IsPull: true, + AssigneeIDs: assigneeIDs, }); err != nil { return fmt.Errorf("newIssue: %v", err) } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 45f76aa9d105c..2e6be00309f83 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -175,7 +175,9 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { Content: form.Body, } - if ctx.Repo.IsWriter() { + // TODO: Get all assigneeIDs and pass them to the function + /* + if ctx.Repo.IsWriter() { if len(form.Assignees) > 0 { for _, assigneeName := range form.Assignees { err := models.AddAssigneeByName(assigneeName, issue, ctx.User) @@ -208,6 +210,8 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { form.Labels = nil } + */ + if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil, nil); err != nil { ctx.Error(500, "NewIssue", err) return diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 58b40a8bd8fe6..1b0d0f2608e76 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -259,7 +259,11 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption Type: models.PullRequestGitea, } - if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch); err != nil { + + // TODO: Get all assigneeIDs and pass them to the function + + + if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, nil); err != nil { ctx.Error(500, "NewPullRequest", err) return } else if err := pr.PushToBaseRepo(); err != nil { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 62e286207240f..167bb2335dc7a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -429,6 +429,12 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 } } } + + // Keep the old assignee id thingy for compatibility reasons + if form.AssigneeID > 0 { + assigneeIDs = append(assigneeIDs, form.AssigneeID) + } + return labelIDs, assigneeIDs, milestoneID } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 7134bdddaac53..ef379da51929a 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -775,8 +775,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) return } - // TODO - labelIDs, _, milestoneID := ValidateRepoMetas(ctx, form) + labelIDs, assigneeIDs, milestoneID := ValidateRepoMetas(ctx, form) if ctx.Written() { return } @@ -812,7 +811,6 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, - //AssigneeID: assigneeID, IsPull: true, Content: form.Content, } @@ -830,7 +828,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. - if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { + if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch, assigneeIDs); err != nil { ctx.ServerError("NewPullRequest", err) return } else if err := pullRequest.PushToBaseRepo(); err != nil { From 2ae1bae252b3e9c10e8820a2edcdecbe06469578 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 13 Mar 2018 14:07:57 +0100 Subject: [PATCH 20/83] fmt --- models/migrations/v59.go | 86 ++++++++++++++++++++++++++++++++++++ routers/api/v1/repo/issue.go | 46 +++++++++---------- routers/api/v1/repo/pull.go | 2 - routers/repo/pull.go | 4 +- 4 files changed, 111 insertions(+), 27 deletions(-) diff --git a/models/migrations/v59.go b/models/migrations/v59.go index a6ea3eef7b665..7e37c053668e7 100644 --- a/models/migrations/v59.go +++ b/models/migrations/v59.go @@ -1 +1,87 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package migrations + +import ( + "code.gitea.io/gitea/models" + + "code.gitea.io/gitea/modules/util" + "github.com/go-xorm/xorm" +) + +func addMultipleAssignees(x *xorm.Engine) error { + + allIssues := []models.Issue{} + err := x.Find(&allIssues) + if err != nil { + return err + } + + // Create the table + type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + } + err = x.Sync2(IssueAssignees{}) + if err != nil { + return err + } + + // Range over all issues and insert a new entry for each issue/assignee + for _, issue := range allIssues { + if issue.AssigneeID != 0 { + _, err := x.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + if err != nil { + return err + } + } + } + + // Updated the comment table + type Comment struct { + ID int64 `xorm:"pk autoincr"` + Type int + PosterID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + OldMilestoneID int64 + MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + + CommitID int64 + Line int64 + Content string `xorm:"TEXT"` + RenderedContent string `xorm:"-"` + + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + + // Reference issue in commit message + CommitSHA string `xorm:"VARCHAR(40)"` + } + err = x.Sync2(Comment{}) + if err != nil { + return err + } + + // Migrate comments + // First update everything to not have nulls in db + _, err = x.Where("type = ?", 9).Update(Comment{RemovedAssignee: false}) + + allAssignementComments := []Comment{} + err = x.Where("type = ?", 9).Find(&allAssignementComments) + + for _, comment := range allAssignementComments { + // Everytime where OldAssigneeID is > 0, the assignement was removed. + if comment.OldAssigneeID > 0 { + _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee: true}) + } + } +} diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 2e6be00309f83..9434e36e73509 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -177,40 +177,40 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { // TODO: Get all assigneeIDs and pass them to the function /* - if ctx.Repo.IsWriter() { - if len(form.Assignees) > 0 { - for _, assigneeName := range form.Assignees { - err := models.AddAssigneeByName(assigneeName, issue, ctx.User) + if ctx.Repo.IsWriter() { + if len(form.Assignees) > 0 { + for _, assigneeName := range form.Assignees { + err := models.AddAssigneeByName(assigneeName, issue, ctx.User) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) + } else { + ctx.Error(500, "AddAssigneeByName", err) + } + return + } + } + } + + // Keeping the old assigning method for compatibility reasons + if len(form.Assignee) > 0 { + err := models.AddAssigneeByName(form.Assignee, issue, ctx.User) if err != nil { if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) } else { ctx.Error(500, "AddAssigneeByName", err) } return } } - } - // Keeping the old assigning method for compatibility reasons - if len(form.Assignee) > 0 { - err := models.AddAssigneeByName(form.Assignee, issue, ctx.User) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "AddAssigneeByName", err) - } - return - } + issue.MilestoneID = form.Milestone + } else { + form.Labels = nil } - issue.MilestoneID = form.Milestone - } else { - form.Labels = nil - } - - */ + */ if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil, nil); err != nil { ctx.Error(500, "NewIssue", err) diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 1b0d0f2608e76..f5546ad466c20 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -259,10 +259,8 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption Type: models.PullRequestGitea, } - // TODO: Get all assigneeIDs and pass them to the function - if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, nil); err != nil { ctx.Error(500, "NewPullRequest", err) return diff --git a/routers/repo/pull.go b/routers/repo/pull.go index ef379da51929a..e6d51abdeab9c 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -811,8 +811,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, - IsPull: true, - Content: form.Content, + IsPull: true, + Content: form.Content, } pullRequest := &models.PullRequest{ HeadRepoID: headRepo.ID, From 5cddeb57d2af7bb4b67afd7d7ce92523f85d41df Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 13 Mar 2018 15:19:49 +0100 Subject: [PATCH 21/83] Fixed assignes showing up two times on issue page + smaller fixes and improvmentsk --- models/issue_assignees.go | 19 +++++++------------ models/issue_mail.go | 2 +- models/migrations/v59.go | 1 + routers/repo/issue.go | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index ad3ebf25f8ae4..b101e4b81c9bb 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -1,3 +1,7 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package models import ( @@ -49,18 +53,9 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - err = issue.loadAssignees(x) - if err != nil { - return false, err - } - - for _, assignee := range issue.Assignees { - if assignee.ID == user.ID { - return true, nil - } - } - - return false, nil + assignees := IssueAssignees{AssigneeID:user.ID, IssueID:issue.ID} + isAssigned, err = x.Get(&assignees) + return } // ClearAssigneesByIssue deletes all assignees for one issue diff --git a/models/issue_mail.go b/models/issue_mail.go index b9b7f02bd9bf2..179bb6527b549 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -46,7 +46,7 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content participants = append(participants, issue.Poster) } - // Assignee must receive any communications + // Assignees must receive any communications assignees, err := GetAssigneesByIssue(issue) if err != nil { return err diff --git a/models/migrations/v59.go b/models/migrations/v59.go index 7e37c053668e7..42a0bf402008d 100644 --- a/models/migrations/v59.go +++ b/models/migrations/v59.go @@ -84,4 +84,5 @@ func addMultipleAssignees(x *xorm.Engine) error { _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee: true}) } } + return nil } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index b7626ce44b40f..d3bcf2e6d8148 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -714,7 +714,7 @@ func ViewIssue(ctx *context.Context) { } } else if comment.Type == models.CommentTypeAssignees { if err = comment.LoadAssigneeUser(); err != nil { - ctx.ServerError("LoadAssignees", err) + ctx.ServerError("LoadAssigneeUser", err) return } } From e8a019a23f2ec1c6050fec70ddab125636495145 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 13 Mar 2018 15:21:58 +0100 Subject: [PATCH 22/83] fmt + lint --- models/issue_assignees.go | 3 ++- models/issue_comment.go | 2 +- models/repo.go | 2 +- models/user.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index b101e4b81c9bb..ad6f549ccd953 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -53,7 +53,7 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - assignees := IssueAssignees{AssigneeID:user.ID, IssueID:issue.ID} + assignees := IssueAssignees{AssigneeID: user.ID, IssueID: issue.ID} isAssigned, err = x.Get(&assignees) return } @@ -137,6 +137,7 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in return nil } +// AddAssigneeByName does what it says func AddAssigneeByName(assigneeName string, issue *Issue, doer *User) (err error) { assignee, err := GetUserByName(assigneeName) if err != nil { diff --git a/models/issue_comment.go b/models/issue_comment.go index 952dc88eb16c7..eb6ccda7672fd 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -240,7 +240,7 @@ func (c *Comment) LoadMilestone() error { return nil } -// LoadAssignees if comment.Type is CommentTypeAssignees, then load assignees +// LoadAssigneeUser if comment.Type is CommentTypeAssignees, then load assignees func (c *Comment) LoadAssigneeUser() error { var err error diff --git a/models/repo.go b/models/repo.go index 531662823fe4d..ced633a90d52a 100644 --- a/models/repo.go +++ b/models/repo.go @@ -554,7 +554,7 @@ func (repo *Repository) GetAssignees() (_ []*User, err error) { return repo.getAssignees(x) } -// GetAssigneeByID returns the user that has write access of repository by given ID. +// GetUserIfHasWriteAccess returns the user that has write access of repository by given ID. func (repo *Repository) GetUserIfHasWriteAccess(userID int64) (*User, error) { return GetUserIfHasWriteAccess(repo, userID) } diff --git a/models/user.go b/models/user.go index d6a7777283520..67322d15b28c6 100644 --- a/models/user.go +++ b/models/user.go @@ -1108,7 +1108,7 @@ func GetUserByID(id int64) (*User, error) { return getUserByID(x, id) } -// GetAssigneeByID returns the user with write access of repository by given ID. +// GetUserIfHasWriteAccess returns the user with write access of repository by given ID. func GetUserIfHasWriteAccess(repo *Repository, userID int64) (*User, error) { has, err := HasAccess(userID, repo, AccessModeWrite) if err != nil { From ed600dfa6ca927f502a96af9afc0355fc3a87c9a Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 20:21:07 +0100 Subject: [PATCH 23/83] Small design settings --- templates/repo/issue/view_content/sidebar.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index c3383989fa735..aab74f2c61688 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -88,7 +88,9 @@ {{.i18n.Tr "repo.issues.new.no_assignees"}}
{{range .Issue.Assignees}} -  {{.Name}} +
+  {{.Name}} +
{{end}}
From 660be02a95940e7e42108fa6937553a42430567b Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 21:44:44 +0100 Subject: [PATCH 24/83] Made adding assignees when creating issues with the api work again --- models/issue.go | 12 +++++++- routers/api/v1/repo/issue.go | 58 +++++++++++++++++------------------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/models/issue.go b/models/issue.go index fe051114ded0c..fba49ed35f15f 100644 --- a/models/issue.go +++ b/models/issue.go @@ -816,7 +816,17 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { // Keep the old assignee id thingy for compatibility reasons if opts.Issue.AssigneeID > 0 { - //opts.AssigneeIDs = append(opts.AssigneeIDs, opts.Issue.AssigneeID) + isAdded := false + // Check if the user has already been passed to issue.AssigneeIDs, if not, add it + for _, aID := range opts.AssigneeIDs{ + if aID == opts.Issue.AssigneeID { + isAdded = true + } + } + + if !isAdded { + opts.AssigneeIDs = append(opts.AssigneeIDs, opts.Issue.AssigneeID) + } } // Check for and validate assignees diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 9434e36e73509..a2228c8d9d51d 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -175,44 +175,40 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { Content: form.Body, } - // TODO: Get all assigneeIDs and pass them to the function - /* - if ctx.Repo.IsWriter() { - if len(form.Assignees) > 0 { - for _, assigneeName := range form.Assignees { - err := models.AddAssigneeByName(assigneeName, issue, ctx.User) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) - } else { - ctx.Error(500, "AddAssigneeByName", err) - } - return - } - } + // Keeping the old assigning method for compatibility reasons + if len(form.Assignee) > 0 { + user, err := models.GetUserByName(form.Assignee) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) + } else { + ctx.Error(500, "AddAssigneeByName", err) } + return + } - // Keeping the old assigning method for compatibility reasons - if len(form.Assignee) > 0 { - err := models.AddAssigneeByName(form.Assignee, issue, ctx.User) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "AddAssigneeByName", err) - } - return + issue.AssigneeID = user.ID + } + + // Loop through the assignees + var assigneeIDs []int64 + if len(form.Assignees) > 0 { + for _, assigneeName := range form.Assignees { + user, err := models.GetUserByName(assigneeName) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) + } else { + ctx.Error(500, "AddAssigneeByName", err) } + return } - issue.MilestoneID = form.Milestone - } else { - form.Labels = nil + assigneeIDs = append(assigneeIDs, user.ID) } + } - */ - - if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil, nil); err != nil { + if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, assigneeIDs, nil); err != nil { ctx.Error(500, "NewIssue", err) return } From 55e8e2c004d848d2c32d47351e32058c5ac78802 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 23:00:03 +0100 Subject: [PATCH 25/83] Added editing assignees via api working again --- models/issue.go | 2 +- routers/api/v1/repo/issue.go | 70 +++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/models/issue.go b/models/issue.go index fba49ed35f15f..610da0620efe0 100644 --- a/models/issue.go +++ b/models/issue.go @@ -818,7 +818,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { if opts.Issue.AssigneeID > 0 { isAdded := false // Check if the user has already been passed to issue.AssigneeIDs, if not, add it - for _, aID := range opts.AssigneeIDs{ + for _, aID := range opts.AssigneeIDs { if aID == opts.Issue.AssigneeID { isAdded = true } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index a2228c8d9d51d..b56f2caa5f3a7 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -285,41 +285,53 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { } // Add/delete assignees - // TODO: How to delete an assignee the way we're currently doing it? - if ctx.Repo.IsWriter() && form.Assignees != nil { - if len(form.Assignees) == 0 { - issue.Assignees = []*models.User{} - } else { - for _, assigneeName := range form.Assignees { - assignee, err := models.GetUserByName(assigneeName) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) - } - return - } - // Only add if the user isn't already assigned - isAssigned, err := models.IsUserAssignedToIssue(issue, assignee) - if err != nil { - ctx.Error(500, "CheckIfUserIsAssigned", err) - return - } - if !isAssigned { - models.UpdateAssignee(issue, ctx.User, assignee.ID) - //issue.Assignees = append(issue.Assignees, assignee) + // Deleting is done the Github way (quote from their api documentation): + // https://developer.github.com/v3/issues/#edit-an-issue + // "assignees" (array): Logins for Users to assign to this issue. + // Pass one or more user logins to replace the set of assignees on this Issue. + // Send an empty array ([]) to clear all assignees from the Issue. + + if ctx.Repo.IsWriter() && (form.Assignees != nil || form.Assignee != nil) { + + // Clear everyone + err := models.ClearAssigneesByIssue(issue) + if err != nil{ + ctx.Error(500, "ClearAssigneesByIssue", err) + return + } + issue.Assignees = []*models.User{} + + // Keep the old assignee thingy for compatibility reasons + if form.Assignee != nil { + if *form.Assignee != "" { + form.Assignees = append(form.Assignees, *form.Assignee) + } + } + + // Loop through all assignees to add them + for _, assigneeName := range form.Assignees { + assignee, err := models.GetUserByName(assigneeName) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee)) + } else { + ctx.Error(500, "GetUserByName", err) } + return } + // Update the assignee. The function will check if the user exists, is already + // assigned (which he shouldn't as we deleted all assignees before) and + // has access to the repo. + err = models.UpdateAssignee(issue, ctx.User, assignee.ID) + if err != nil { + ctx.Error(500, "UpdateAssignee", err) + return + } } - - /*if err = models.UpdateIssueUserByAssignee(issue); err != nil { - ctx.Error(500, "UpdateIssueUserByAssignee", err) - return - }*/ } + if ctx.Repo.IsWriter() && form.Milestone != nil && issue.MilestoneID != *form.Milestone { oldMilestoneID := issue.MilestoneID From 423b3f89772b4222aefd198e792ca8500728077f Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 23:00:29 +0100 Subject: [PATCH 26/83] fmt --- routers/api/v1/repo/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index b56f2caa5f3a7..c8c157b7e5b9e 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -296,7 +296,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { // Clear everyone err := models.ClearAssigneesByIssue(issue) - if err != nil{ + if err != nil { ctx.Error(500, "ClearAssigneesByIssue", err) return } From b6b18b6b3ba67e25d15d1e38a42c8ec4dc4310bd Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 23:50:14 +0100 Subject: [PATCH 27/83] Made pull request assignments via the api work again + added helper functions for assignee checking + swagger update --- models/issue_assignees.go | 81 +++++++++++++++++++++++++++++++++--- public/swagger.v1.json | 21 ++++++++++ routers/api/v1/repo/issue.go | 79 +++++++---------------------------- routers/api/v1/repo/pull.go | 48 +++++++++++++-------- 4 files changed, 141 insertions(+), 88 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index ad6f549ccd953..627c02fd0734f 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -137,13 +137,82 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in return nil } -// AddAssigneeByName does what it says -func AddAssigneeByName(assigneeName string, issue *Issue, doer *User) (err error) { - assignee, err := GetUserByName(assigneeName) +// UpdateAPIAssignee is a helper function to add or delete one or multiple issue assignee(s) +// Deleting is done the Github way (quote from their api documentation): +// https://developer.github.com/v3/issues/#edit-an-issue +// "assignees" (array): Logins for Users to assign to this issue. +// Pass one or more user logins to replace the set of assignees on this Issue. +// Send an empty array ([]) to clear all assignees from the Issue. +func UpdateAPIAssignee (issue *Issue, oneAssignee string, multipleAssignees []string, doer *User) (err error){ + // Clear everyone + err = ClearAssigneesByIssue(issue) if err != nil { - return + return err + } + issue.Assignees = []*User{} + + // Keep the old assignee thingy for compatibility reasons + if oneAssignee != "" { + // Prevent double adding assignees + var isDouble bool + for _, assignee := range multipleAssignees{ + if assignee == oneAssignee { + isDouble = true + } + } + + if !isDouble { + multipleAssignees = append(multipleAssignees, oneAssignee) + } + } + + // Loop through all assignees to add them + for _, assigneeName := range multipleAssignees { + assignee, err := GetUserByName(assigneeName) + if err != nil { + return err + } + + // Update the assignee. The function will check if the user exists, is already + // assigned (which he shouldn't as we deleted all assignees before) and + // has access to the repo. + err = UpdateAssignee(issue, doer, assignee.ID) + if err != nil { + return err + } + } + + return +} + +func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string) (assigneeIDs []int64, err error) { + + // Keeping the old assigning method for compatibility reasons + if len(oneAssignee) > 0 { + + // Prevent double adding assignees + var isDouble bool + for _, assignee := range multipleAssignees{ + if assignee == oneAssignee { + isDouble = true + } + } + + if !isDouble { + multipleAssignees = append(multipleAssignees, oneAssignee) + } } - // update - return UpdateAssignee(issue, doer, assignee.ID) + // Loop through the assignees + if len(multipleAssignees) > 0 { + for _, assigneeName := range multipleAssignees { + user, err := GetUserByName(assigneeName) + if err != nil { + return nil, err + } + + assigneeIDs = append(assigneeIDs, user.ID) + } + } + return } diff --git a/public/swagger.v1.json b/public/swagger.v1.json index 0edd5a51ae157..a6f499b5661cc 100644 --- a/public/swagger.v1.json +++ b/public/swagger.v1.json @@ -5656,6 +5656,13 @@ "type": "string", "x-go-name": "Assignee" }, + "assignees": { + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "Assignees" + }, "base": { "type": "string", "x-go-name": "Base" @@ -5965,6 +5972,13 @@ "type": "string", "x-go-name": "Assignee" }, + "assignees": { + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "Assignees" + }, "body": { "type": "string", "x-go-name": "Body" @@ -6055,6 +6069,13 @@ "type": "string", "x-go-name": "Assignee" }, + "assignees": { + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "Assignees" + }, "body": { "type": "string", "x-go-name": "Body" diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index c8c157b7e5b9e..2532ba97d2f00 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -175,37 +175,15 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { Content: form.Body, } - // Keeping the old assigning method for compatibility reasons - if len(form.Assignee) > 0 { - user, err := models.GetUserByName(form.Assignee) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "AddAssigneeByName", err) - } - return - } - - issue.AssigneeID = user.ID - } - - // Loop through the assignees - var assigneeIDs []int64 - if len(form.Assignees) > 0 { - for _, assigneeName := range form.Assignees { - user, err := models.GetUserByName(assigneeName) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", assigneeName)) - } else { - ctx.Error(500, "AddAssigneeByName", err) - } - return - } - - assigneeIDs = append(assigneeIDs, user.ID) + // Get all assignee IDs + assigneeIDs, err := models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err)) + } else { + ctx.Error(500, "AddAssigneeByName", err) } + return } if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, assigneeIDs, nil); err != nil { @@ -221,7 +199,6 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { } // Refetch from database to assign some automatic values - var err error issue, err = models.GetIssueByID(issue.ID) if err != nil { ctx.Error(500, "GetIssueByID", err) @@ -294,41 +271,15 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { if ctx.Repo.IsWriter() && (form.Assignees != nil || form.Assignee != nil) { - // Clear everyone - err := models.ClearAssigneesByIssue(issue) - if err != nil { - ctx.Error(500, "ClearAssigneesByIssue", err) - return + oneAssignee := "" + if form.Assignee != nil{ + oneAssignee = *form.Assignee } - issue.Assignees = []*models.User{} - // Keep the old assignee thingy for compatibility reasons - if form.Assignee != nil { - if *form.Assignee != "" { - form.Assignees = append(form.Assignees, *form.Assignee) - } - } - - // Loop through all assignees to add them - for _, assigneeName := range form.Assignees { - assignee, err := models.GetUserByName(assigneeName) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) - } - return - } - - // Update the assignee. The function will check if the user exists, is already - // assigned (which he shouldn't as we deleted all assignees before) and - // has access to the repo. - err = models.UpdateAssignee(issue, ctx.User, assignee.ID) - if err != nil { - ctx.Error(500, "UpdateAssignee", err) - return - } + err = models.UpdateAPIAssignee(issue, oneAssignee, form.Assignees, ctx.User) + if err != nil { + ctx.Error(500, "UpdateAPIAssignee", err) + return } } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index f5546ad466c20..bc50881bf8771 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -210,7 +210,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption milestoneID = milestone.ID } - if len(form.Assignee) > 0 { + /*if len(form.Assignee) > 0 { assigneeUser, err := models.GetUserByName(form.Assignee) if err != nil { if models.IsErrUserNotExist(err) { @@ -228,7 +228,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption } assigneeID = assignee.ID - } + }*/ patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch) if err != nil { @@ -259,9 +259,18 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption Type: models.PullRequestGitea, } - // TODO: Get all assigneeIDs and pass them to the function + // Get all assignee IDs + assigneeIDs, err := models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err)) + } else { + ctx.Error(500, "AddAssigneeByName", err) + } + return + } - if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, nil); err != nil { + if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, assigneeIDs); err != nil { ctx.Error(500, "NewPullRequest", err) return } else if err := pr.PushToBaseRepo(); err != nil { @@ -330,21 +339,24 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) { issue.Content = form.Body } - if ctx.Repo.IsWriter() && len(form.Assignee) > 0 && - (issue.Assignee == nil || issue.Assignee.LowerName != strings.ToLower(form.Assignee)) { - if len(form.Assignee) == 0 { - issue.AssigneeID = 0 - } else { - assignee, err := models.GetUserByName(form.Assignee) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) - } - return + // Add/delete assignees + + // Deleting is done the Github way (quote from their api documentation): + // https://developer.github.com/v3/issues/#edit-an-issue + // "assignees" (array): Logins for Users to assign to this issue. + // Pass one or more user logins to replace the set of assignees on this Issue. + // Send an empty array ([]) to clear all assignees from the Issue. + + if ctx.Repo.IsWriter() && (form.Assignees != nil || len(form.Assignee) > 0) { + + err = models.UpdateAPIAssignee(issue, form.Assignee, form.Assignees, ctx.User) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err)) + } else { + ctx.Error(500, "UpdateAPIAssignee", err) } - issue.AssigneeID = assignee.ID + return } } From 27acaed1d0642db9430280c0222ed40577b54a2a Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 20 Mar 2018 23:51:23 +0100 Subject: [PATCH 28/83] fmt + lint --- models/issue_assignees.go | 7 ++++--- routers/api/v1/repo/issue.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 627c02fd0734f..5d137e911a1ca 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -143,7 +143,7 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in // "assignees" (array): Logins for Users to assign to this issue. // Pass one or more user logins to replace the set of assignees on this Issue. // Send an empty array ([]) to clear all assignees from the Issue. -func UpdateAPIAssignee (issue *Issue, oneAssignee string, multipleAssignees []string, doer *User) (err error){ +func UpdateAPIAssignee(issue *Issue, oneAssignee string, multipleAssignees []string, doer *User) (err error) { // Clear everyone err = ClearAssigneesByIssue(issue) if err != nil { @@ -155,7 +155,7 @@ func UpdateAPIAssignee (issue *Issue, oneAssignee string, multipleAssignees []st if oneAssignee != "" { // Prevent double adding assignees var isDouble bool - for _, assignee := range multipleAssignees{ + for _, assignee := range multipleAssignees { if assignee == oneAssignee { isDouble = true } @@ -185,6 +185,7 @@ func UpdateAPIAssignee (issue *Issue, oneAssignee string, multipleAssignees []st return } +// MakeIDsFromAPIAssigneesToAdd returns an array with all assignee IDs func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string) (assigneeIDs []int64, err error) { // Keeping the old assigning method for compatibility reasons @@ -192,7 +193,7 @@ func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string // Prevent double adding assignees var isDouble bool - for _, assignee := range multipleAssignees{ + for _, assignee := range multipleAssignees { if assignee == oneAssignee { isDouble = true } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 2532ba97d2f00..23f6d00d0c682 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -272,7 +272,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { if ctx.Repo.IsWriter() && (form.Assignees != nil || form.Assignee != nil) { oneAssignee := "" - if form.Assignee != nil{ + if form.Assignee != nil { oneAssignee = *form.Assignee } From 8fd82e632fd75748b770c1f5cd1b86b41c758591 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 11:40:39 +0100 Subject: [PATCH 29/83] Last bugfixes + tests work now --- models/fixtures/issue.yml | 2 -- models/fixtures/issue_assignees.yml | 8 ++++++++ models/fixtures/issue_user.yml | 3 --- models/issue.go | 7 ------- models/issue_assignees.go | 20 ++++++++++++++++++++ models/issue_user_test.go | 21 ++++----------------- models/user.go | 2 +- 7 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 models/fixtures/issue_assignees.yml diff --git a/models/fixtures/issue.yml b/models/fixtures/issue.yml index ff514e706c95c..4de8c4fa7e2cf 100644 --- a/models/fixtures/issue.yml +++ b/models/fixtures/issue.yml @@ -3,7 +3,6 @@ repo_id: 1 index: 1 poster_id: 1 - assignee_id: 1 name: issue1 content: content for the first issue is_closed: false @@ -67,7 +66,6 @@ repo_id: 3 index: 1 poster_id: 1 - assignee_id: 1 name: issue6 content: content6 is_closed: false diff --git a/models/fixtures/issue_assignees.yml b/models/fixtures/issue_assignees.yml new file mode 100644 index 0000000000000..1be07df7d4a46 --- /dev/null +++ b/models/fixtures/issue_assignees.yml @@ -0,0 +1,8 @@ +- + id: 1 + assignee_id: 1 + issue_id: 1 +- + id: 2 + assignee_id: 1 + issue_id: 6 diff --git a/models/fixtures/issue_user.yml b/models/fixtures/issue_user.yml index b3f98a71d3df2..8039b1e40ff15 100644 --- a/models/fixtures/issue_user.yml +++ b/models/fixtures/issue_user.yml @@ -3,7 +3,6 @@ uid: 1 issue_id: 1 is_read: true - is_assigned: true is_mentioned: false - @@ -11,7 +10,6 @@ uid: 2 issue_id: 1 is_read: true - is_assigned: false is_mentioned: false - @@ -19,5 +17,4 @@ uid: 4 issue_id: 1 is_read: false - is_assigned: false is_mentioned: false diff --git a/models/issue.go b/models/issue.go index 610da0620efe0..331931f0d05cf 100644 --- a/models/issue.go +++ b/models/issue.go @@ -61,13 +61,6 @@ type Issue struct { Assignees []*User `xorm:"-"` } -// IssueAssignees saves all issue assignees -type IssueAssignees struct { - ID int64 `xorm:"pk autoincr"` - AssigneeID int64 `xorm:"INDEX"` - IssueID int64 `xorm:"INDEX"` -} - var ( issueTasksPat *regexp.Regexp issueTasksDonePat *regexp.Regexp diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 5d137e911a1ca..f53a3c2012bd3 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -13,6 +13,13 @@ import ( "github.com/go-xorm/xorm" ) +// IssueAssignees saves all issue assignees +type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` +} + // This loads all assignees of an issue func (issue *Issue) loadAssignees(e Engine) (err error) { var assigneeIDs []IssueAssignees @@ -84,6 +91,19 @@ func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { return } +// ClearAssigneeByUserID deletes all assignments of an user +func ClearAssigneeByUserID(userID int64) (err error){ + sess := x.NewSession() + defer sess.Close() + + return clearAssigneeByUserID(sess, userID) +} + +func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error){ + _, err = sess.Delete(&IssueAssignees{AssigneeID:userID}) + return +} + // UpdateAssignee deletes or adds an assignee to an issue func UpdateAssignee(issue *Issue, doer *User, assigneeID int64) (err error) { return issue.ChangeAssignee(doer, assigneeID) diff --git a/models/issue_user_test.go b/models/issue_user_test.go index e3ebfa8fa2809..6752a531a0aa6 100644 --- a/models/issue_user_test.go +++ b/models/issue_user_test.go @@ -2,6 +2,10 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package models import ( @@ -32,23 +36,6 @@ func Test_newIssueUsers(t *testing.T) { AssertExistsAndLoadBean(t, &IssueUser{IssueID: newIssue.ID, UID: repo.OwnerID}) } -func TestUpdateIssueUserByAssignee(t *testing.T) { - assert.NoError(t, PrepareTestDatabase()) - issue := AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue) - - // artificially change assignee in issue_user table - AssertSuccessfulInsert(t, &IssueUser{IssueID: issue.ID, UID: 5, IsAssigned: true}) - _, err := x.Cols("is_assigned"). - Update(&IssueUser{IsAssigned: false}, &IssueUser{IssueID: issue.ID, UID: issue.AssigneeID}) - assert.NoError(t, err) - - assert.NoError(t, UpdateIssueUserByAssignee(issue)) - - // issue_user table should now be correct again - AssertExistsAndLoadBean(t, &IssueUser{IssueID: issue.ID, UID: issue.AssigneeID}, "is_assigned=1") - AssertExistsAndLoadBean(t, &IssueUser{IssueID: issue.ID, UID: 5}, "is_assigned=0") -} - func TestUpdateIssueUserByRead(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) issue := AssertExistsAndLoadBean(t, &Issue{ID: 1}).(*Issue) diff --git a/models/user.go b/models/user.go index 67322d15b28c6..938494d4bc92d 100644 --- a/models/user.go +++ b/models/user.go @@ -991,7 +991,7 @@ func deleteUser(e *xorm.Session, u *User) error { // ***** END: PublicKey ***** // Clear assignee. - if _, err = e.Exec("UPDATE `issue` SET assignee_id=0 WHERE assignee_id=?", u.ID); err != nil { + if err = clearAssigneeByUserID(e, u.ID); err != nil { return fmt.Errorf("clear assignee: %v", err) } From 57cfe6136340430c2c4611695b34e47b3ccbcd9f Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 11:49:27 +0100 Subject: [PATCH 30/83] small improvments + typos --- models/issue.go | 2 +- models/issue_assignees.go | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/models/issue.go b/models/issue.go index 331931f0d05cf..a65bf12e91933 100644 --- a/models/issue.go +++ b/models/issue.go @@ -306,7 +306,7 @@ func (issue *Issue) APIFormat() *api.Issue { for _, assignee := range issue.Assignees { apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat()) } - apiIssue.Assignee = issue.Assignees[0].APIFormat() // For compatibily, we're keeping the first assignee as `apiIssue.Assignee` + apiIssue.Assignee = issue.Assignees[0].APIFormat() // For compatibility, we're keeping the first assignee as `apiIssue.Assignee` } if issue.IsPull { apiIssue.PullRequest = &api.PullRequestMeta{ diff --git a/models/issue_assignees.go b/models/issue_assignees.go index f53a3c2012bd3..5c9a2eba474ee 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -92,15 +92,8 @@ func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { } // ClearAssigneeByUserID deletes all assignments of an user -func ClearAssigneeByUserID(userID int64) (err error){ - sess := x.NewSession() - defer sess.Close() - - return clearAssigneeByUserID(sess, userID) -} - -func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error){ - _, err = sess.Delete(&IssueAssignees{AssigneeID:userID}) +func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error) { + _, err = sess.Delete(&IssueAssignees{AssigneeID: userID}) return } From 2dea0eefbf1575be826e382c9ebdca67f4191152 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 14:15:55 +0100 Subject: [PATCH 31/83] vendor update --- vendor/code.gitea.io/sdk/gitea/issue.go | 12 +++++----- vendor/code.gitea.io/sdk/gitea/pull.go | 30 ++++++++++++------------- vendor/vendor.json | 6 ++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/vendor/code.gitea.io/sdk/gitea/issue.go b/vendor/code.gitea.io/sdk/gitea/issue.go index 0b32115ed7871..199f2c7a4b613 100644 --- a/vendor/code.gitea.io/sdk/gitea/issue.go +++ b/vendor/code.gitea.io/sdk/gitea/issue.go @@ -90,7 +90,7 @@ type CreateIssueOption struct { Title string `json:"title" binding:"Required"` Body string `json:"body"` // username of assignee - Assignee string `json:"assignee"` + Assignee string `json:"assignee"` Assignees []string `json:"assignees"` // milestone id Milestone int64 `json:"milestone"` @@ -112,12 +112,12 @@ func (c *Client) CreateIssue(owner, repo string, opt CreateIssueOption) (*Issue, // EditIssueOption options for editing an issue type EditIssueOption struct { - Title string `json:"title"` - Body *string `json:"body"` - Assignee *string `json:"assignee"` + Title string `json:"title"` + Body *string `json:"body"` + Assignee *string `json:"assignee"` Assignees []string `json:"assignees"` - Milestone *int64 `json:"milestone"` - State *string `json:"state"` + Milestone *int64 `json:"milestone"` + State *string `json:"state"` } // EditIssue modify an existing issue for a given repository diff --git a/vendor/code.gitea.io/sdk/gitea/pull.go b/vendor/code.gitea.io/sdk/gitea/pull.go index 70a4a6470b7b0..6f3f240166105 100644 --- a/vendor/code.gitea.io/sdk/gitea/pull.go +++ b/vendor/code.gitea.io/sdk/gitea/pull.go @@ -80,14 +80,14 @@ func (c *Client) GetPullRequest(owner, repo string, index int64) (*PullRequest, // CreatePullRequestOption options when creating a pull request type CreatePullRequestOption struct { - Head string `json:"head" binding:"Required"` - Base string `json:"base" binding:"Required"` - Title string `json:"title" binding:"Required"` - Body string `json:"body"` - Assignee string `json:"assignee"` - Assignees []string `json:"assignees"` - Milestone int64 `json:"milestone"` - Labels []int64 `json:"labels"` + Head string `json:"head" binding:"Required"` + Base string `json:"base" binding:"Required"` + Title string `json:"title" binding:"Required"` + Body string `json:"body"` + Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` + Milestone int64 `json:"milestone"` + Labels []int64 `json:"labels"` } // CreatePullRequest create pull request with options @@ -103,13 +103,13 @@ func (c *Client) CreatePullRequest(owner, repo string, opt CreatePullRequestOpti // EditPullRequestOption options when modify pull request type EditPullRequestOption struct { - Title string `json:"title"` - Body string `json:"body"` - Assignee string `json:"assignee"` - Assignees []string `json:"assignees"` - Milestone int64 `json:"milestone"` - Labels []int64 `json:"labels"` - State *string `json:"state"` + Title string `json:"title"` + Body string `json:"body"` + Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` + Milestone int64 `json:"milestone"` + Labels []int64 `json:"labels"` + State *string `json:"state"` } // EditPullRequest modify pull request with PR id and options diff --git a/vendor/vendor.json b/vendor/vendor.json index 7d4cf1aa458e0..1fb468cfc0ed0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -9,10 +9,10 @@ "revisionTime": "2018-02-10T03:05:43Z" }, { - "checksumSHA1": "PWaIU7g1YSkETxka2DIS1EYsPK0=", + "checksumSHA1": "8RxanLo3OM8EHEPmUQy+heh3hMQ=", "path": "code.gitea.io/sdk/gitea", - "revision": "cdbef997666132599cc92dc22aa94de3db04adeb", - "revisionTime": "2018-03-02T14:48:43Z" + "revision": "e097f05b098f62cc07660e2b88e17000fdd08bca", + "revisionTime": "2018-03-22T10:52:27Z" }, { "checksumSHA1": "bOODD4Gbw3GfcuQPU2dI40crxxk=", From 87a8499f2620f028cc14c567ee8fe8cdff90674d Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 14:23:03 +0100 Subject: [PATCH 32/83] change nothing but trigger ci --- models/issue_assignees.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 5c9a2eba474ee..bedd9a72682f1 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -74,6 +74,7 @@ func ClearAssigneesByIssue(issue *Issue) (err error) { return nil } + // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { err = issue.loadAssignees(x) From c06d7587f36060cc7ce8d4549471e06ba5562f00 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 14:23:13 +0100 Subject: [PATCH 33/83] change nothing but trigger ci --- models/issue_assignees.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index bedd9a72682f1..5c9a2eba474ee 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -74,7 +74,6 @@ func ClearAssigneesByIssue(issue *Issue) (err error) { return nil } - // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { err = issue.loadAssignees(x) From a6b746b809c11914dc4bea7c67f6052578b3f76f Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 17:01:06 +0100 Subject: [PATCH 34/83] small improvements and fixes --- models/issue.go | 1 + models/issue_assignees.go | 3 +-- models/issue_user.go | 1 + models/migrations/v59.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/issue.go b/models/issue.go index a65bf12e91933..35201571682cb 100644 --- a/models/issue.go +++ b/models/issue.go @@ -814,6 +814,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { for _, aID := range opts.AssigneeIDs { if aID == opts.Issue.AssigneeID { isAdded = true + break } } diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 5c9a2eba474ee..4ecb47381036c 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -60,8 +60,7 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - assignees := IssueAssignees{AssigneeID: user.ID, IssueID: issue.ID} - isAssigned, err = x.Get(&assignees) + isAssigned, err = x.Exist(&IssueAssignees{AssigneeID: user.ID, IssueID: issue.ID}) return } diff --git a/models/issue_user.go b/models/issue_user.go index 302b9bd0a9c7b..08dd9fce70be8 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -6,6 +6,7 @@ package models import ( "fmt" + "github.com/go-xorm/xorm" ) diff --git a/models/migrations/v59.go b/models/migrations/v59.go index 42a0bf402008d..25cea4539e2e1 100644 --- a/models/migrations/v59.go +++ b/models/migrations/v59.go @@ -73,7 +73,7 @@ func addMultipleAssignees(x *xorm.Engine) error { // Migrate comments // First update everything to not have nulls in db - _, err = x.Where("type = ?", 9).Update(Comment{RemovedAssignee: false}) + _, err = x.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) allAssignementComments := []Comment{} err = x.Where("type = ?", 9).Find(&allAssignementComments) From 9f9fc22f6609eb3ffaffa0b18ee04f673a202896 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 17:04:18 +0100 Subject: [PATCH 35/83] MakeAssigneeList now uses a pointer to the issue --- models/issue_assignees.go | 2 +- models/webhook_dingtalk.go | 2 +- models/webhook_discord.go | 2 +- models/webhook_slack.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 4ecb47381036c..b4fdb49213fcd 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -74,7 +74,7 @@ func ClearAssigneesByIssue(issue *Issue) (err error) { } // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. -func MakeAssigneeList(issue Issue) (AssigneeList string, err error) { +func MakeAssigneeList(issue *Issue) (AssigneeList string, err error) { err = issue.loadAssignees(x) if err != nil { return "", err diff --git a/models/webhook_dingtalk.go b/models/webhook_dingtalk.go index 5d78ae5b604d2..719ffcae736aa 100644 --- a/models/webhook_dingtalk.go +++ b/models/webhook_dingtalk.go @@ -118,7 +118,7 @@ func getDingtalkPullRequestPayload(p *api.PullRequestPayload) (*DingtalkPayload, title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) text = p.PullRequest.Body case api.HookIssueAssigned: - list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID}) if err != nil { return &DingtalkPayload{}, err } diff --git a/models/webhook_discord.go b/models/webhook_discord.go index 21b1b173f0b7a..40d9d58992fc6 100644 --- a/models/webhook_discord.go +++ b/models/webhook_discord.go @@ -191,7 +191,7 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta) text = p.PullRequest.Body color = warnColor case api.HookIssueAssigned: - list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID}) if err != nil { return &DiscordPayload{}, err } diff --git a/models/webhook_slack.go b/models/webhook_slack.go index 07eb893ea70b1..256819adc560e 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -172,7 +172,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink) attachmentText = SlackTextFormatter(p.PullRequest.Body) case api.HookIssueAssigned: - list, err := MakeAssigneeList(Issue{ID: p.PullRequest.ID}) + list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID}) if err != nil { return &SlackPayload{}, err } From 3c38ae2af132e8be1d5077ae588dba34eb562c41 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 17:32:59 +0100 Subject: [PATCH 36/83] Added transaction to migration --- models/migrations/v59.go | 47 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/models/migrations/v59.go b/models/migrations/v59.go index 25cea4539e2e1..0e1c9ae4d40e1 100644 --- a/models/migrations/v59.go +++ b/models/migrations/v59.go @@ -5,15 +5,36 @@ package migrations import ( - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/util" + "github.com/go-xorm/xorm" ) func addMultipleAssignees(x *xorm.Engine) error { - allIssues := []models.Issue{} + // Redeclare issue struct + type Issue struct { + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` + Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. + PosterID int64 `xorm:"INDEX"` + Title string `xorm:"name"` + Content string `xorm:"TEXT"` + MilestoneID int64 `xorm:"INDEX"` + Priority int + AssigneeID int64 `xorm:"INDEX"` + IsClosed bool `xorm:"INDEX"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + NumComments int + Ref string + + DeadlineUnix util.TimeStamp `xorm:"INDEX"` + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + ClosedUnix util.TimeStamp `xorm:"INDEX"` + } + + allIssues := []Issue{} err := x.Find(&allIssues) if err != nil { return err @@ -31,10 +52,16 @@ func addMultipleAssignees(x *xorm.Engine) error { } // Range over all issues and insert a new entry for each issue/assignee + sess := x.NewSession() + defer sess.Close() + + err = sess.Begin() + for _, issue := range allIssues { if issue.AssigneeID != 0 { - _, err := x.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + _, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) if err != nil { + sess.Rollback() return err } } @@ -73,16 +100,22 @@ func addMultipleAssignees(x *xorm.Engine) error { // Migrate comments // First update everything to not have nulls in db - _, err = x.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) + _, err = sess.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) allAssignementComments := []Comment{} - err = x.Where("type = ?", 9).Find(&allAssignementComments) + err = sess.Where("type = ?", 9).Find(&allAssignementComments) for _, comment := range allAssignementComments { // Everytime where OldAssigneeID is > 0, the assignement was removed. if comment.OldAssigneeID > 0 { - _, err = x.Id(comment.ID).Update(Comment{RemovedAssignee: true}) + _, err = sess.ID(comment.ID).Update(Comment{RemovedAssignee: true}) } } + + err = sess.Commit() + if err != nil { + return err + } + return nil } From 5a5815f5bfdc654cd9e66fef2f9b02eafd98f7cf Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 17:33:42 +0100 Subject: [PATCH 37/83] fmt --- models/migrations/v59.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/models/migrations/v59.go b/models/migrations/v59.go index 0e1c9ae4d40e1..21596f41ccc3c 100644 --- a/models/migrations/v59.go +++ b/models/migrations/v59.go @@ -14,19 +14,19 @@ func addMultipleAssignees(x *xorm.Engine) error { // Redeclare issue struct type Issue struct { - ID int64 `xorm:"pk autoincr"` - RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` - Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. - PosterID int64 `xorm:"INDEX"` - Title string `xorm:"name"` - Content string `xorm:"TEXT"` - MilestoneID int64 `xorm:"INDEX"` - Priority int - AssigneeID int64 `xorm:"INDEX"` - IsClosed bool `xorm:"INDEX"` - IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. - NumComments int - Ref string + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` + Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. + PosterID int64 `xorm:"INDEX"` + Title string `xorm:"name"` + Content string `xorm:"TEXT"` + MilestoneID int64 `xorm:"INDEX"` + Priority int + AssigneeID int64 `xorm:"INDEX"` + IsClosed bool `xorm:"INDEX"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + NumComments int + Ref string DeadlineUnix util.TimeStamp `xorm:"INDEX"` CreatedUnix util.TimeStamp `xorm:"INDEX created"` From 343a9327ffa56baf46700b10f0afcf8410be81a2 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 22 Mar 2018 20:38:58 +0100 Subject: [PATCH 38/83] Added unit tests for multiple assingees + small fixes --- models/issue_assignees.go | 3 ++ models/issue_assignees_test.go | 71 ++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 models/issue_assignees_test.go diff --git a/models/issue_assignees.go b/models/issue_assignees.go index b4fdb49213fcd..5589c3c2a3348 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -22,6 +22,9 @@ type IssueAssignees struct { // This loads all assignees of an issue func (issue *Issue) loadAssignees(e Engine) (err error) { + // Reset maybe preexisting assignees + issue.Assignees = []*User{} + var assigneeIDs []IssueAssignees err = e.Where("issue_id = ?", issue.ID).Find(&assigneeIDs) diff --git a/models/issue_assignees_test.go b/models/issue_assignees_test.go new file mode 100644 index 0000000000000..c6ae7f8a28969 --- /dev/null +++ b/models/issue_assignees_test.go @@ -0,0 +1,71 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestUpdateAssignee(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // Fake issue with assignees + issue, err := GetIssueByID(1) + assert.NoError(t, err) + + // Assign multiple users + user2, err := GetUserByID(2) + assert.NoError(t, err) + err = UpdateAssignee(issue, &User{ID:1}, user2.ID) + assert.NoError(t, err) + + user3, err := GetUserByID(3) + assert.NoError(t, err) + err = UpdateAssignee(issue, &User{ID:1}, user3.ID) + assert.NoError(t, err) + + user1, err := GetUserByID(1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him + assert.NoError(t, err) + err = UpdateAssignee(issue, &User{ID:1}, user1.ID) + assert.NoError(t, err) + + // Check if he got removed + isAssigned, err := IsUserAssignedToIssue(issue, user1) + assert.NoError(t, err) + assert.False(t, isAssigned) + + // Check if they're all there + assignees, err := GetAssigneesByIssue(issue) + assert.NoError(t, err) + + var expectedAssignees []*User + expectedAssignees = append(expectedAssignees, user2) + expectedAssignees = append(expectedAssignees, user3) + + for in, assignee := range assignees { + assert.Equal(t, assignee.ID, expectedAssignees[in].ID) + } + + // Check if the user is assigned + isAssigned, err = IsUserAssignedToIssue(issue, user2) + assert.NoError(t, err) + assert.True(t, isAssigned) + + // This user should not be assigned + isAssigned, err = IsUserAssignedToIssue(issue, &User{ID:4}) + assert.NoError(t, err) + assert.False(t, isAssigned) + + // Clean everyone + err = ClearAssigneesByIssue(issue) + assert.NoError(t, err) + + // Check they're gone + assignees, err = GetAssigneesByIssue(issue) + assert.NoError(t, err) + assert.Equal(t, 0, len(assignees)) +} From f900090e40358e6d924bdb600eae5712a4d4c95d Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 14:56:34 +0200 Subject: [PATCH 39/83] Merge branch 'master' of https://github.com/go-gitea/gitea into multiple-assignees # Conflicts: # models/migrations/migrations.go # models/migrations/v59.go --- models/migrations/v60.go | 120 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/models/migrations/v60.go b/models/migrations/v60.go index a6ea3eef7b665..21596f41ccc3c 100644 --- a/models/migrations/v60.go +++ b/models/migrations/v60.go @@ -1 +1,121 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package migrations + +import ( + "code.gitea.io/gitea/modules/util" + + "github.com/go-xorm/xorm" +) + +func addMultipleAssignees(x *xorm.Engine) error { + + // Redeclare issue struct + type Issue struct { + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` + Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. + PosterID int64 `xorm:"INDEX"` + Title string `xorm:"name"` + Content string `xorm:"TEXT"` + MilestoneID int64 `xorm:"INDEX"` + Priority int + AssigneeID int64 `xorm:"INDEX"` + IsClosed bool `xorm:"INDEX"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + NumComments int + Ref string + + DeadlineUnix util.TimeStamp `xorm:"INDEX"` + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + ClosedUnix util.TimeStamp `xorm:"INDEX"` + } + + allIssues := []Issue{} + err := x.Find(&allIssues) + if err != nil { + return err + } + + // Create the table + type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + } + err = x.Sync2(IssueAssignees{}) + if err != nil { + return err + } + + // Range over all issues and insert a new entry for each issue/assignee + sess := x.NewSession() + defer sess.Close() + + err = sess.Begin() + + for _, issue := range allIssues { + if issue.AssigneeID != 0 { + _, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + if err != nil { + sess.Rollback() + return err + } + } + } + + // Updated the comment table + type Comment struct { + ID int64 `xorm:"pk autoincr"` + Type int + PosterID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + OldMilestoneID int64 + MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + + CommitID int64 + Line int64 + Content string `xorm:"TEXT"` + RenderedContent string `xorm:"-"` + + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + + // Reference issue in commit message + CommitSHA string `xorm:"VARCHAR(40)"` + } + err = x.Sync2(Comment{}) + if err != nil { + return err + } + + // Migrate comments + // First update everything to not have nulls in db + _, err = sess.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) + + allAssignementComments := []Comment{} + err = sess.Where("type = ?", 9).Find(&allAssignementComments) + + for _, comment := range allAssignementComments { + // Everytime where OldAssigneeID is > 0, the assignement was removed. + if comment.OldAssigneeID > 0 { + _, err = sess.ID(comment.ID).Update(Comment{RemovedAssignee: true}) + } + } + + err = sess.Commit() + if err != nil { + return err + } + + return nil +} From b7600a6f480b4f5576628ce9645dd6aa0b036fe1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 14:59:45 +0200 Subject: [PATCH 40/83] fmt --- models/issue_assignees_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/models/issue_assignees_test.go b/models/issue_assignees_test.go index c6ae7f8a28969..0e17bd087f57a 100644 --- a/models/issue_assignees_test.go +++ b/models/issue_assignees_test.go @@ -20,17 +20,17 @@ func TestUpdateAssignee(t *testing.T) { // Assign multiple users user2, err := GetUserByID(2) assert.NoError(t, err) - err = UpdateAssignee(issue, &User{ID:1}, user2.ID) + err = UpdateAssignee(issue, &User{ID: 1}, user2.ID) assert.NoError(t, err) user3, err := GetUserByID(3) assert.NoError(t, err) - err = UpdateAssignee(issue, &User{ID:1}, user3.ID) + err = UpdateAssignee(issue, &User{ID: 1}, user3.ID) assert.NoError(t, err) user1, err := GetUserByID(1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him assert.NoError(t, err) - err = UpdateAssignee(issue, &User{ID:1}, user1.ID) + err = UpdateAssignee(issue, &User{ID: 1}, user1.ID) assert.NoError(t, err) // Check if he got removed @@ -56,7 +56,7 @@ func TestUpdateAssignee(t *testing.T) { assert.True(t, isAssigned) // This user should not be assigned - isAssigned, err = IsUserAssignedToIssue(issue, &User{ID:4}) + isAssigned, err = IsUserAssignedToIssue(issue, &User{ID: 4}) assert.NoError(t, err) assert.False(t, isAssigned) @@ -67,5 +67,5 @@ func TestUpdateAssignee(t *testing.T) { // Check they're gone assignees, err = GetAssigneesByIssue(issue) assert.NoError(t, err) - assert.Equal(t, 0, len(assignees)) + assert.Equal(t, 0, len(assignees)) } From 44bd7a53095ed13db5ee49839a133c07c2ac242f Mon Sep 17 00:00:00 2001 From: Konrad Date: Sun, 25 Mar 2018 23:18:26 +0200 Subject: [PATCH 41/83] Improvments to removing already existing issue assignees via the api --- models/issue_assignees.go | 65 ++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 5589c3c2a3348..63aa6b94e5630 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -63,7 +63,7 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - isAssigned, err = x.Exist(&IssueAssignees{AssigneeID: user.ID, IssueID: issue.ID}) + isAssigned, err = x.Exist(&IssueAssignees{IssueID:issue.ID, AssigneeID: user.ID}) return } @@ -76,6 +76,30 @@ func ClearAssigneesByIssue(issue *Issue) (err error) { return nil } +// Deletes all assignees who aren't passed via the "assignees" array +func deleteNotPassedAssignee(issue *Issue, doer *User, assigees []*User) (err error) { + var found bool + + for _, assignee := range issue.Assignees { + + found = false + for _, alreadyAssignee := range assigees { + if assignee.ID == alreadyAssignee.ID { + found = true + break + } + } + + if !found { + if err := UpdateAssignee(issue, doer, assignee.ID); err != nil { + return err + } + } + } + + return nil +} + // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. func MakeAssigneeList(issue *Issue) (AssigneeList string, err error) { err = issue.loadAssignees(x) @@ -99,6 +123,19 @@ func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error) { return } +func AddAssigneeIfNotAssigned(issue *Issue, doer *User, assigneeID int64) (err error) { + // Check if the user is already assigned + isAssigned, err := IsUserAssignedToIssue(issue, &User{ID: assigneeID}) + if err != nil { + return err + } + + if !isAssigned { + return issue.ChangeAssignee(doer, assigneeID) + } + return nil +} + // UpdateAssignee deletes or adds an assignee to an issue func UpdateAssignee(issue *Issue, doer *User, assigneeID int64) (err error) { return issue.ChangeAssignee(doer, assigneeID) @@ -159,12 +196,7 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in // Pass one or more user logins to replace the set of assignees on this Issue. // Send an empty array ([]) to clear all assignees from the Issue. func UpdateAPIAssignee(issue *Issue, oneAssignee string, multipleAssignees []string, doer *User) (err error) { - // Clear everyone - err = ClearAssigneesByIssue(issue) - if err != nil { - return err - } - issue.Assignees = []*User{} + var allNewAssignees []*User // Keep the old assignee thingy for compatibility reasons if oneAssignee != "" { @@ -188,10 +220,21 @@ func UpdateAPIAssignee(issue *Issue, oneAssignee string, multipleAssignees []str return err } - // Update the assignee. The function will check if the user exists, is already - // assigned (which he shouldn't as we deleted all assignees before) and - // has access to the repo. - err = UpdateAssignee(issue, doer, assignee.ID) + allNewAssignees = append(allNewAssignees, assignee) + } + + // Delete all old assignees not passed + if err = deleteNotPassedAssignee(issue, doer, allNewAssignees); err != nil { + return err + } + + // Add all new assignees + // Update the assignee. The function will check if the user exists, is already + // assigned (which he shouldn't as we deleted all assignees before) and + // has access to the repo. + for _, assignee := range allNewAssignees { + // Extra method to prevent double adding (which would result in removing) + err = AddAssigneeIfNotAssigned(issue, doer, assignee.ID) if err != nil { return err } From 19bba7c9f9e6d90215723198c31242db77088d25 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:38:25 +0200 Subject: [PATCH 42/83] fixed lint --- models/issue_assignees.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 63aa6b94e5630..879e98d7356a8 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -123,6 +123,7 @@ func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error) { return } +// AddAssigneeIfNotAssigned adds an assignee only if he isn't aleady assigned to the issue func AddAssigneeIfNotAssigned(issue *Issue, doer *User, assigneeID int64) (err error) { // Check if the user is already assigned isAssigned, err := IsUserAssignedToIssue(issue, &User{ID: assigneeID}) From e89bf78be694dcbaf8af556677509268c10c5900 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:42:12 +0200 Subject: [PATCH 43/83] Added descriptive comment --- models/issue_assignees.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 879e98d7356a8..c32c9145407ae 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -91,6 +91,7 @@ func deleteNotPassedAssignee(issue *Issue, doer *User, assigees []*User) (err er } if !found { + // This function also does comments and hooks, which is why we call it seperatly instead of directly removing the assignees here if err := UpdateAssignee(issue, doer, assignee.ID); err != nil { return err } From 194ba1603fe71dd0af15308b30e55ce7f6622507 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:46:33 +0200 Subject: [PATCH 44/83] Change nothing but TRIGGER THE FUCKING CI SO IT PICKS UP THE LATEST COMMIT INSTEAD OF BUILDING AN OLD ONE WHILE STILL SAYING IT'S PULLING THE NEWEST COMMIT --- models/issue_assignees.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index c32c9145407ae..79ce32aa83891 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -118,6 +118,7 @@ func MakeAssigneeList(issue *Issue) (AssigneeList string, err error) { return } + // ClearAssigneeByUserID deletes all assignments of an user func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error) { _, err = sess.Delete(&IssueAssignees{AssigneeID: userID}) From d1d53164a9fbf8f292a7bac11c4960c7a5f69edb Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:46:42 +0200 Subject: [PATCH 45/83] Change nothing but TRIGGER THE FUCKING CI SO IT PICKS UP THE LATEST COMMIT INSTEAD OF BUILDING AN OLD ONE WHILE STILL SAYING IT'S PULLING THE NEWEST COMMIT --- models/issue_assignees.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index 79ce32aa83891..c32c9145407ae 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -118,7 +118,6 @@ func MakeAssigneeList(issue *Issue) (AssigneeList string, err error) { return } - // ClearAssigneeByUserID deletes all assignments of an user func clearAssigneeByUserID(sess *xorm.Session, userID int64) (err error) { _, err = sess.Delete(&IssueAssignees{AssigneeID: userID}) From 494ee08f09ff480e16bcd47dada35bb9bed3596d Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:48:49 +0200 Subject: [PATCH 46/83] fmt --- models/issue_assignees.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index c32c9145407ae..d904640d26b12 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -63,7 +63,7 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { - isAssigned, err = x.Exist(&IssueAssignees{IssueID:issue.ID, AssigneeID: user.ID}) + isAssigned, err = x.Exist(&IssueAssignees{IssueID: issue.ID, AssigneeID: user.ID}) return } From 16c609a61f0793047e15a7d5c7d73951ba3e1f0e Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:51:11 +0200 Subject: [PATCH 47/83] Change nothing but TRIGGER THE FUCKING CI SO IT PICKS UP THE LATEST COMMIT INSTEAD OF BUILDING AN OLD ONE WHILE STILL SAYING IT'S PULLING THE NEWEST COMMIT --- models/issue_assignees.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index d904640d26b12..bd06c575a9a74 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -61,6 +61,7 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { return issue.Assignees, nil } + // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { isAssigned, err = x.Exist(&IssueAssignees{IssueID: issue.ID, AssigneeID: user.ID}) From 2303fc0c5db50b452d68b65b55f3cc20666c67f1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 25 Mar 2018 23:51:19 +0200 Subject: [PATCH 48/83] Change nothing but TRIGGER THE FUCKING CI SO IT PICKS UP THE LATEST COMMIT INSTEAD OF BUILDING AN OLD ONE WHILE STILL SAYING IT'S PULLING THE NEWEST COMMIT --- models/issue_assignees.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/issue_assignees.go b/models/issue_assignees.go index bd06c575a9a74..d904640d26b12 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -61,7 +61,6 @@ func GetAssigneesByIssue(issue *Issue) (assignees []*User, err error) { return issue.Assignees, nil } - // IsUserAssignedToIssue returns true when the user is assigned to the issue func IsUserAssignedToIssue(issue *Issue, user *User) (isAssigned bool, err error) { isAssigned, err = x.Exist(&IssueAssignees{IssueID: issue.ID, AssigneeID: user.ID}) From d47c230aec775950a774c7319a93424ba5fb4a78 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 28 Mar 2018 22:27:00 +0200 Subject: [PATCH 49/83] Merge branch 'master' of https://github.com/go-gitea/gitea into multiple-assignees --- models/migrations/migrations.go | 4 +- models/migrations/v61.go | 120 ++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index aab4f7ca042cf..f104331460075 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -173,9 +173,9 @@ var migrations = []Migration{ // v59 -> v60 NewMigration("add merge whitelist for protected branches", addProtectedBranchMergeWhitelist), // v60 -> v61 - NewMigration("add multiple assignees", addMultipleAssignees), - // v60 -> v61 NewMigration("add is_fsck_enabled column for repos", addFsckEnabledToRepo), + // v61 -> v62 + NewMigration("add multiple assignees", addMultipleAssignees), } // Migrate database to current version diff --git a/models/migrations/v61.go b/models/migrations/v61.go index a6ea3eef7b665..21596f41ccc3c 100644 --- a/models/migrations/v61.go +++ b/models/migrations/v61.go @@ -1 +1,121 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package migrations + +import ( + "code.gitea.io/gitea/modules/util" + + "github.com/go-xorm/xorm" +) + +func addMultipleAssignees(x *xorm.Engine) error { + + // Redeclare issue struct + type Issue struct { + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` + Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. + PosterID int64 `xorm:"INDEX"` + Title string `xorm:"name"` + Content string `xorm:"TEXT"` + MilestoneID int64 `xorm:"INDEX"` + Priority int + AssigneeID int64 `xorm:"INDEX"` + IsClosed bool `xorm:"INDEX"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + NumComments int + Ref string + + DeadlineUnix util.TimeStamp `xorm:"INDEX"` + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + ClosedUnix util.TimeStamp `xorm:"INDEX"` + } + + allIssues := []Issue{} + err := x.Find(&allIssues) + if err != nil { + return err + } + + // Create the table + type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + } + err = x.Sync2(IssueAssignees{}) + if err != nil { + return err + } + + // Range over all issues and insert a new entry for each issue/assignee + sess := x.NewSession() + defer sess.Close() + + err = sess.Begin() + + for _, issue := range allIssues { + if issue.AssigneeID != 0 { + _, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + if err != nil { + sess.Rollback() + return err + } + } + } + + // Updated the comment table + type Comment struct { + ID int64 `xorm:"pk autoincr"` + Type int + PosterID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + OldMilestoneID int64 + MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + + CommitID int64 + Line int64 + Content string `xorm:"TEXT"` + RenderedContent string `xorm:"-"` + + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + + // Reference issue in commit message + CommitSHA string `xorm:"VARCHAR(40)"` + } + err = x.Sync2(Comment{}) + if err != nil { + return err + } + + // Migrate comments + // First update everything to not have nulls in db + _, err = sess.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) + + allAssignementComments := []Comment{} + err = sess.Where("type = ?", 9).Find(&allAssignementComments) + + for _, comment := range allAssignementComments { + // Everytime where OldAssigneeID is > 0, the assignement was removed. + if comment.OldAssigneeID > 0 { + _, err = sess.ID(comment.ID).Update(Comment{RemovedAssignee: true}) + } + } + + err = sess.Commit() + if err != nil { + return err + } + + return nil +} From 07b3e10de766cc0f0dce65c20b7148fca6d827f9 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 28 Mar 2018 22:42:17 +0200 Subject: [PATCH 50/83] Small fixes and improvments --- models/issue.go | 10 ++++------ models/issue_assignees.go | 26 ++++++++++---------------- models/issue_user.go | 1 + models/migrations/v61.go | 7 +------ routers/api/v1/repo/pull.go | 20 -------------------- 5 files changed, 16 insertions(+), 48 deletions(-) diff --git a/models/issue.go b/models/issue.go index 35201571682cb..ff996e371ec55 100644 --- a/models/issue.go +++ b/models/issue.go @@ -849,12 +849,10 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } // Insert the assignees - if len(opts.AssigneeIDs) > 0 { - for _, assigneeID := range opts.AssigneeIDs { - err = opts.Issue.changeAssignee(e, doer, assigneeID) - if err != nil { - return err - } + for _, assigneeID := range opts.AssigneeIDs { + err = opts.Issue.changeAssignee(e, doer, assigneeID) + if err != nil { + return err } } diff --git a/models/issue_assignees.go b/models/issue_assignees.go index d904640d26b12..e9e865fdf6dbc 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -77,13 +77,13 @@ func ClearAssigneesByIssue(issue *Issue) (err error) { } // Deletes all assignees who aren't passed via the "assignees" array -func deleteNotPassedAssignee(issue *Issue, doer *User, assigees []*User) (err error) { +func deleteNotPassedAssignee(issue *Issue, doer *User, assignees []*User) (err error) { var found bool for _, assignee := range issue.Assignees { found = false - for _, alreadyAssignee := range assigees { + for _, alreadyAssignee := range assignees { if assignee.ID == alreadyAssignee.ID { found = true break @@ -102,17 +102,17 @@ func deleteNotPassedAssignee(issue *Issue, doer *User, assigees []*User) (err er } // MakeAssigneeList concats a string with all names of the assignees. Useful for logs. -func MakeAssigneeList(issue *Issue) (AssigneeList string, err error) { +func MakeAssigneeList(issue *Issue) (assigneeList string, err error) { err = issue.loadAssignees(x) if err != nil { return "", err } for in, assignee := range issue.Assignees { - AssigneeList += assignee.Name + assigneeList += assignee.Name if len(issue.Assignees) > (in + 1) { - AssigneeList += ", " + assigneeList += ", " } } return @@ -207,6 +207,7 @@ func UpdateAPIAssignee(issue *Issue, oneAssignee string, multipleAssignees []str for _, assignee := range multipleAssignees { if assignee == oneAssignee { isDouble = true + break } } @@ -249,13 +250,14 @@ func UpdateAPIAssignee(issue *Issue, oneAssignee string, multipleAssignees []str func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string) (assigneeIDs []int64, err error) { // Keeping the old assigning method for compatibility reasons - if len(oneAssignee) > 0 { + if oneAssignee != "" { // Prevent double adding assignees var isDouble bool for _, assignee := range multipleAssignees { if assignee == oneAssignee { isDouble = true + break } } @@ -264,16 +266,8 @@ func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string } } - // Loop through the assignees - if len(multipleAssignees) > 0 { - for _, assigneeName := range multipleAssignees { - user, err := GetUserByName(assigneeName) - if err != nil { - return nil, err - } + // Get the IDs of all assignees + assigneeIDs = GetUserIDsByNames(multipleAssignees) - assigneeIDs = append(assigneeIDs, user.ID) - } - } return } diff --git a/models/issue_user.go b/models/issue_user.go index 08dd9fce70be8..79ccfd71f78c5 100644 --- a/models/issue_user.go +++ b/models/issue_user.go @@ -65,6 +65,7 @@ func updateIssueAssignee(e *xorm.Session, issue *Issue, assigneeID int64) (remov for _, assignee := range issue.Assignees { if assignee.ID == assigneeID { toBeDeleted = true + break } } diff --git a/models/migrations/v61.go b/models/migrations/v61.go index 21596f41ccc3c..76bea47c88ae5 100644 --- a/models/migrations/v61.go +++ b/models/migrations/v61.go @@ -112,10 +112,5 @@ func addMultipleAssignees(x *xorm.Engine) error { } } - err = sess.Commit() - if err != nil { - return err - } - - return nil + return sess.Commit() } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index bc50881bf8771..59617a8601a59 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -210,26 +210,6 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption milestoneID = milestone.ID } - /*if len(form.Assignee) > 0 { - assigneeUser, err := models.GetUserByName(form.Assignee) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", form.Assignee)) - } else { - ctx.Error(500, "GetUserByName", err) - } - return - } - - assignee, err := repo.GetUserIfHasWriteAccess(assigneeUser.ID) - if err != nil { - ctx.Error(500, "GetAssigneeByID", err) - return - } - - assigneeID = assignee.ID - }*/ - patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch) if err != nil { ctx.Error(500, "GetPatch", err) From c9bd49a0a35de2bd14377571e771f7cfc0403a78 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 28 Mar 2018 23:08:25 +0200 Subject: [PATCH 51/83] Deleted unnessecary license headers --- models/issue.go | 4 ---- models/issue_user_test.go | 4 ---- routers/api/v1/repo/issue.go | 4 ---- 3 files changed, 12 deletions(-) diff --git a/models/issue.go b/models/issue.go index ff996e371ec55..2193e9bec2292 100644 --- a/models/issue.go +++ b/models/issue.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -// Copyright 2018 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - package models import ( diff --git a/models/issue_user_test.go b/models/issue_user_test.go index 6752a531a0aa6..a333bc861996a 100644 --- a/models/issue_user_test.go +++ b/models/issue_user_test.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -// Copyright 2018 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - package models import ( diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 23f6d00d0c682..1973f5bbb6814 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -// Copyright 2018 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - package repo import ( From 8d33ef88a3c54a255a1716d1957c7f8ba67f76fb Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 3 Apr 2018 10:40:54 +0200 Subject: [PATCH 52/83] Merge branch 'master' of https://github.com/go-gitea/gitea into multiple-assignees # Conflicts: # models/migrations/migrations.go # models/migrations/v61.go --- models/migrations/v62.go | 115 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/models/migrations/v62.go b/models/migrations/v62.go index a6ea3eef7b665..76bea47c88ae5 100644 --- a/models/migrations/v62.go +++ b/models/migrations/v62.go @@ -1 +1,116 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package migrations + +import ( + "code.gitea.io/gitea/modules/util" + + "github.com/go-xorm/xorm" +) + +func addMultipleAssignees(x *xorm.Engine) error { + + // Redeclare issue struct + type Issue struct { + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX UNIQUE(repo_index)"` + Index int64 `xorm:"UNIQUE(repo_index)"` // Index in one repository. + PosterID int64 `xorm:"INDEX"` + Title string `xorm:"name"` + Content string `xorm:"TEXT"` + MilestoneID int64 `xorm:"INDEX"` + Priority int + AssigneeID int64 `xorm:"INDEX"` + IsClosed bool `xorm:"INDEX"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + NumComments int + Ref string + + DeadlineUnix util.TimeStamp `xorm:"INDEX"` + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + ClosedUnix util.TimeStamp `xorm:"INDEX"` + } + + allIssues := []Issue{} + err := x.Find(&allIssues) + if err != nil { + return err + } + + // Create the table + type IssueAssignees struct { + ID int64 `xorm:"pk autoincr"` + AssigneeID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + } + err = x.Sync2(IssueAssignees{}) + if err != nil { + return err + } + + // Range over all issues and insert a new entry for each issue/assignee + sess := x.NewSession() + defer sess.Close() + + err = sess.Begin() + + for _, issue := range allIssues { + if issue.AssigneeID != 0 { + _, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID}) + if err != nil { + sess.Rollback() + return err + } + } + } + + // Updated the comment table + type Comment struct { + ID int64 `xorm:"pk autoincr"` + Type int + PosterID int64 `xorm:"INDEX"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + OldMilestoneID int64 + MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 + RemovedAssignee bool + OldTitle string + NewTitle string + + CommitID int64 + Line int64 + Content string `xorm:"TEXT"` + RenderedContent string `xorm:"-"` + + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + + // Reference issue in commit message + CommitSHA string `xorm:"VARCHAR(40)"` + } + err = x.Sync2(Comment{}) + if err != nil { + return err + } + + // Migrate comments + // First update everything to not have nulls in db + _, err = sess.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}) + + allAssignementComments := []Comment{} + err = sess.Where("type = ?", 9).Find(&allAssignementComments) + + for _, comment := range allAssignementComments { + // Everytime where OldAssigneeID is > 0, the assignement was removed. + if comment.OldAssigneeID > 0 { + _, err = sess.ID(comment.ID).Update(Comment{RemovedAssignee: true}) + } + } + + return sess.Commit() +} From a95dad317df87a86bfad35d5574aecf8576dce11 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Apr 2018 12:59:37 +0200 Subject: [PATCH 53/83] Added custom error type if a passed user does not has access to the repo it's assigned to --- models/error.go | 16 ++++++++++++++++ models/issue.go | 9 +++++++-- models/pull.go | 3 +++ routers/api/v1/repo/issue.go | 4 ++++ routers/api/v1/repo/pull.go | 4 ++++ routers/repo/issue.go | 4 ++++ routers/repo/pull.go | 4 ++++ 7 files changed, 42 insertions(+), 2 deletions(-) diff --git a/models/error.go b/models/error.go index d24da2642e67b..cdb18d23ce5cb 100644 --- a/models/error.go +++ b/models/error.go @@ -733,6 +733,22 @@ func (err ErrRepoFileAlreadyExist) Error() string { return fmt.Sprintf("repository file already exists [file_name: %s]", err.FileName) } +// ErrUserDoesNotHaveAccessToRepo represets an error where the user doesn't has access to a given repo +type ErrUserDoesNotHaveAccessToRepo struct { + UserID int64 + RepoName string +} + +// IsErrUserDoesNotHaveAccessToRepo checks if an error is a ErrRepoFileAlreadyExist. +func IsErrUserDoesNotHaveAccessToRepo(err error) bool { + _, ok := err.(ErrUserDoesNotHaveAccessToRepo) + return ok +} + +func (err ErrUserDoesNotHaveAccessToRepo) Error() string { + return fmt.Sprintf("user doesn't have acces to repo [user_id: %d, repo_name: %s]", err.UserID, err.RepoName) +} + // __________ .__ // \______ \____________ ____ ____ | |__ // | | _/\_ __ \__ \ / \_/ ___\| | \ diff --git a/models/issue.go b/models/issue.go index 2193e9bec2292..02526d4f85f5a 100644 --- a/models/issue.go +++ b/models/issue.go @@ -827,9 +827,11 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { if err != nil { return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assigneeID, opts.Repo.ID, err) } - if valid { - validAssigneeIDs = append(validAssigneeIDs, assigneeID) + if !valid { + return ErrUserDoesNotHaveAccessToRepo{UserID: assigneeID, RepoName: opts.Repo.Name} } + + validAssigneeIDs = append(validAssigneeIDs, assigneeID) } } @@ -921,6 +923,9 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, assigneeIDs []in Attachments: uuids, AssigneeIDs: assigneeIDs, }); err != nil { + if IsErrUserDoesNotHaveAccessToRepo(err) { + return err + } return fmt.Errorf("newIssue: %v", err) } diff --git a/models/pull.go b/models/pull.go index 1479993295c62..1138766c32169 100644 --- a/models/pull.go +++ b/models/pull.go @@ -734,6 +734,9 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str IsPull: true, AssigneeIDs: assigneeIDs, }); err != nil { + if IsErrUserDoesNotHaveAccessToRepo(err) { + return err + } return fmt.Errorf("newIssue: %v", err) } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index bd8174c2c5081..156c3c3fb288f 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -183,6 +183,10 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { } if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, assigneeIDs, nil); err != nil { + if models.IsErrUserDoesNotHaveAccessToRepo(err) { + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + return + } ctx.Error(500, "NewIssue", err) return } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 59617a8601a59..b6e23e47c908d 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -251,6 +251,10 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption } if err := models.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, assigneeIDs); err != nil { + if models.IsErrUserDoesNotHaveAccessToRepo(err) { + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + return + } ctx.Error(500, "NewPullRequest", err) return } else if err := pr.PushToBaseRepo(); err != nil { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 81c9a6454c2ad..b518cc2556c9a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -476,6 +476,10 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { Ref: form.Ref, } if err := models.NewIssue(repo, issue, labelIDs, assigneeIDs, attachments); err != nil { + if models.IsErrUserDoesNotHaveAccessToRepo(err) { + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + return + } ctx.ServerError("NewIssue", err) return } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index e6d51abdeab9c..6176c2c99a0ff 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -829,6 +829,10 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) // instead of 500. if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch, assigneeIDs); err != nil { + if models.IsErrUserDoesNotHaveAccessToRepo(err) { + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + return + } ctx.ServerError("NewPullRequest", err) return } else if err := pullRequest.PushToBaseRepo(); err != nil { From 066eef46d654e48bd70ba9117a8b4c4a349886a8 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Apr 2018 14:06:13 +0200 Subject: [PATCH 54/83] Added custom error type if a passed user does not has access to the repo it's assigned to --- routers/repo/issue.go | 2 +- routers/repo/pull.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index b518cc2556c9a..540ec87f532d6 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -477,7 +477,7 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { } if err := models.NewIssue(repo, issue, labelIDs, assigneeIDs, attachments); err != nil { if models.IsErrUserDoesNotHaveAccessToRepo(err) { - ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err.Error()) return } ctx.ServerError("NewIssue", err) diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 6176c2c99a0ff..dfe07ca44aac3 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -830,7 +830,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch, assigneeIDs); err != nil { if models.IsErrUserDoesNotHaveAccessToRepo(err) { - ctx.Error(400, "UserDoesNotHaveAccessToRepo", err) + ctx.Error(400, "UserDoesNotHaveAccessToRepo", err.Error()) return } ctx.ServerError("NewPullRequest", err) From 2f4b6f8ce53b4eba8e36e605a3e59d9de62c5940 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Apr 2018 14:30:16 +0200 Subject: [PATCH 55/83] Improved loading assignees for a list of issues --- models/issue_list.go | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/models/issue_list.go b/models/issue_list.go index f98de06bb7ebf..a29c2889db1b7 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -155,11 +155,38 @@ func (issues IssueList) loadMilestones(e Engine) error { } func (issues IssueList) loadAssignees(e Engine) error { - for in := range issues { - err := issues[in].loadAssignees(e) + if len(issues) == 0 { + return nil + } + + type AssigneeIssue struct { + Assignee *User `xorm:"extends"` + IssueAssignee *IssueAssignees `xorm:"extends"` + } + + var assignees = make(map[int64][]*User, len(issues)) + rows, err := e.Table("issue_assignees"). + Join("INNER", "issue", "issue.id = issue_assignees.issue_id"). + Join("INNER", "user", "user.id = issue_assignees.assignee_id"). + In("issue.id", issues.getIssueIDs()). + Rows(new(AssigneeIssue)) + if err != nil { + return err + } + defer rows.Close() + + for rows.Next() { + var assigneeIssue AssigneeIssue + err = rows.Scan(&assigneeIssue) if err != nil { return err } + + assignees[assigneeIssue.IssueAssignee.IssueID] = append(assignees[assigneeIssue.IssueAssignee.IssueID], assigneeIssue.Assignee) + } + + for _, issue := range issues { + issue.Assignees = assignees[issue.ID] } return nil } From 9f9f4351818f30c0e3b77c1ffdc0f6c7753e6efa Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Apr 2018 15:03:55 +0200 Subject: [PATCH 56/83] Improved adding/removing assignees via UI --- public/js/index.js | 15 ++++++++++++++- templates/repo/issue/view_content/sidebar.tmpl | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 9cb22383e01cf..81c655dc2ec3b 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -187,6 +187,7 @@ function initCommentForm() { var hasLabelUpdateAction = $listMenu.data('action') == 'update'; $('.' + selector).dropdown('setting', 'onHide', function(){ + hasLabelUpdateAction = $listMenu.data('action') == 'update'; // Update the var if (hasLabelUpdateAction) { location.reload(); } @@ -195,13 +196,25 @@ function initCommentForm() { $listMenu.find('.item:not(.no-select)').click(function () { // we don't need the action attribute when updating assignees - if (selector == 'select-assignees' && hasLabelUpdateAction) { + if (selector == 'select-assignees') { + + // UI magic. We need to do this here, otherwise it would destroy the functionality of + // adding/removing labels + if ($(this).hasClass('checked')) { + $(this).removeClass('checked'); + $(this).find('.octicon').removeClass('octicon-check'); + } else { + $(this).addClass('checked'); + $(this).find('.octicon').addClass('octicon-check'); + } + updateIssuesMeta( $listMenu.data('update-url'), "", $listMenu.data('issue-id'), $(this).data('id') ); + $listMenu.data('action', 'update'); return false; } diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index aab74f2c61688..692a7ce9b5a37 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -73,7 +73,7 @@ {{.i18n.Tr "repo.issues.new.assignees"}} -
+
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} {{/* From 3d12ded8e99b88529118a0873f4178e2c98b5bdd Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Apr 2018 15:17:29 +0200 Subject: [PATCH 57/83] Improved adding/removing assignees via UI --- templates/repo/issue/view_content/sidebar.tmpl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 692a7ce9b5a37..3e1e146e4a2b7 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -76,11 +76,18 @@
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} - {{/* - {{if .IsChecked}}checked{{end}} - {{if .IsChecked}}octicon-check{{end}} -
{{.Name}}
*/}} - {{.Name}} + + {{$AssigneeID := .ID}} + + {{.Name}} {{end}}
From 91aa3de69324f7f0edaa3146cd7163dc88e15281 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 10 Apr 2018 15:37:08 +0200 Subject: [PATCH 58/83] cleanup --- models/issue.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/models/issue.go b/models/issue.go index 02526d4f85f5a..52be6c30b59da 100644 --- a/models/issue.go +++ b/models/issue.go @@ -820,7 +820,6 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } // Check for and validate assignees - var validAssigneeIDs []int64 if len(opts.AssigneeIDs) > 0 { for _, assigneeID := range opts.AssigneeIDs { valid, err := hasAccess(e, assigneeID, opts.Repo, AccessModeWrite) @@ -830,8 +829,6 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { if !valid { return ErrUserDoesNotHaveAccessToRepo{UserID: assigneeID, RepoName: opts.Repo.Name} } - - validAssigneeIDs = append(validAssigneeIDs, assigneeID) } } From 248d252b52c01a0fcb1820808b4e5925c0d3e7f7 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 14 Apr 2018 13:26:38 +0200 Subject: [PATCH 59/83] (hopefully) fixed postgresql error when building issue list with assignee join --- models/issue_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_list.go b/models/issue_list.go index a29c2889db1b7..4a3ed852b5df8 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -167,7 +167,7 @@ func (issues IssueList) loadAssignees(e Engine) error { var assignees = make(map[int64][]*User, len(issues)) rows, err := e.Table("issue_assignees"). Join("INNER", "issue", "issue.id = issue_assignees.issue_id"). - Join("INNER", "user", "user.id = issue_assignees.assignee_id"). + Join("INNER", "user", "`user`.id = `issue_assignees`.assignee_id"). In("issue.id", issues.getIssueIDs()). Rows(new(AssigneeIssue)) if err != nil { From 0bfbeef3cae42450dbd7059b3d4cd68c84ab8b29 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 14 Apr 2018 13:34:17 +0200 Subject: [PATCH 60/83] (hopefully) fixed postgresql error when building issue list with assignee join --- models/issue_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_list.go b/models/issue_list.go index 4a3ed852b5df8..8839e106707da 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -166,7 +166,7 @@ func (issues IssueList) loadAssignees(e Engine) error { var assignees = make(map[int64][]*User, len(issues)) rows, err := e.Table("issue_assignees"). - Join("INNER", "issue", "issue.id = issue_assignees.issue_id"). + Join("INNER", "issue", "`issue`.id = `issue_assignees`.issue_id"). Join("INNER", "user", "`user`.id = `issue_assignees`.assignee_id"). In("issue.id", issues.getIssueIDs()). Rows(new(AssigneeIssue)) From 71e9ebcb0dfb1739b2330fb6657e4fb7eda1f955 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 15 Apr 2018 12:36:38 +0200 Subject: [PATCH 61/83] Fixed assignee select dropdown ui --- public/css/index.css | 2 +- public/js/index.js | 12 ++++++++---- public/less/_repository.less | 9 ++++++--- templates/repo/issue/new_form.tmpl | 16 ++++++++-------- templates/repo/issue/view_content/sidebar.tmpl | 8 ++++++-- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 26a34250af519..46fb0042b68cc 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -1 +1 @@ -.tribute-container{box-shadow:0 1px 3px 1px #c7c7c7}.tribute-container ul{background:#fff}.tribute-container li{padding:8px 12px;border-bottom:1px solid #dcdcdc}.tribute-container li img{display:inline-block;vertical-align:middle;width:28px;height:28px;margin-right:5px}.tribute-container li span.fullname{font-weight:400;font-size:.8rem;margin-left:3px}.tribute-container li.highlight,.tribute-container li:hover{background:#2185D0;color:#fff}.emoji{width:1.5em;height:1.5em;display:inline-block;background-size:contain}body{font-family:Lato,"Segoe UI","Microsoft YaHei",Arial,Helvetica,sans-serif!important;background-color:#fff;overflow-y:scroll;-webkit-font-smoothing:antialiased}img{border-radius:3px}.rounded{border-radius:.28571429rem!important}code,pre{font:12px Consolas,"Liberation Mono",Menlo,Courier,monospace}code.raw,pre.raw{padding:7px 12px;margin:10px 0;background-color:#f8f8f8;border:1px solid #ddd;border-radius:3px;font-size:13px;line-height:1.5;overflow:auto}code.wrap,pre.wrap{white-space:pre-wrap;-ms-word-break:break-all;word-break:break-all;overflow-wrap:break-word;word-wrap:break-word}.dont-break-out{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.full.height{padding:0;margin:0 0 -80px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%;margin:0}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .column .menu{margin-top:0}.following.bar .top.menu a.item.brand{padding-left:0}.following.bar .brand .ui.mini.image{width:30px}.following.bar .top.menu .dropdown.item.active,.following.bar .top.menu .dropdown.item:hover,.following.bar .top.menu a.item:hover{background-color:transparent}.following.bar .top.menu a.item:hover{color:rgba(0,0,0,.45)}.following.bar .top.menu .menu{z-index:900}.following.bar .octicon{margin-right:.75em}.following.bar .octicon.fitted{margin-right:0}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .text .octicon{width:16px;text-align:center}@media only screen and (max-width:767px){.following.bar #navbar:not(.shown)>:not(:first-child){display:none}}.right.stackable.menu{margin-left:auto;display:flex;display:-ms-flexbox;-ms-flex-align:inherit;align-items:inherit;-ms-flex-direction:inherit;flex-direction:inherit}.ui.left{float:left}.ui.right{float:right}.ui.button,.ui.menu .item{-moz-user-select:auto;-ms-user-select:auto;-webkit-user-select:auto;user-select:auto}.ui.container.fluid.padded{padding:0 10px 0 10px}.ui.form .ui.button{font-weight:400}.ui.menu,.ui.segment,.ui.vertical.menu{box-shadow:none}.ui .menu:not(.vertical) .item>.button.compact{padding:.58928571em 1.125em}.ui .menu:not(.vertical) .item>.button.small{font-size:.92857143rem}.ui .text.red{color:#d95c5c!important}.ui .text.red a{color:#d95c5c!important}.ui .text.red a:hover{color:#E67777!important}.ui .text.blue{color:#428bca!important}.ui .text.blue a{color:#15c!important}.ui .text.blue a:hover{color:#428bca!important}.ui .text.black{color:#444}.ui .text.black:hover{color:#000}.ui .text.grey{color:#767676!important}.ui .text.grey a{color:#444!important}.ui .text.grey a:hover{color:#000!important}.ui .text.light.grey{color:#888!important}.ui .text.green{color:#6cc644!important}.ui .text.purple{color:#6e5494!important}.ui .text.yellow{color:#FBBD08!important}.ui .text.gold{color:#a1882b!important}.ui .text.left{text-align:left!important}.ui .text.right{text-align:right!important}.ui .text.small{font-size:.75em}.ui .text.normal{font-weight:400}.ui .text.bold{font-weight:700}.ui .text.italic{font-style:italic}.ui .text.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block}.ui .text.thin{font-weight:400}.ui .text.middle{vertical-align:middle}.ui .message{text-align:center}.ui .header>i+.content{padding-left:.75rem;vertical-align:middle}.ui .warning.header{background-color:#F9EDBE!important;border-color:#F0C36D}.ui .warning.segment{border-color:#F0C36D}.ui .info.segment{border:1px solid #c5d5dd}.ui .info.segment.top{background-color:#e6f1f6!important}.ui .info.segment.top h3,.ui .info.segment.top h4{margin-top:0}.ui .info.segment.top h3:last-child{margin-top:4px}.ui .info.segment.top>:last-child{margin-bottom:0}.ui .normal.header{font-weight:400}.ui .avatar.image{border-radius:3px}.ui .form .fake{display:none!important}.ui .form .sub.field{margin-left:25px}.ui .sha.label{font-family:Consolas,Menlo,Monaco,"Lucida Console",monospace;font-size:13px;padding:6px 10px 4px 10px;font-weight:400;margin:0 6px}.ui.status.buttons .octicon{margin-right:4px}.ui.inline.delete-button{padding:8px 15px;font-weight:400}.ui .background.red{background-color:#d95c5c!important}.ui .background.blue{background-color:#428bca!important}.ui .background.black{background-color:#444}.ui .background.grey{background-color:#767676!important}.ui .background.light.grey{background-color:#888!important}.ui .background.green{background-color:#6cc644!important}.ui .background.purple{background-color:#6e5494!important}.ui .background.yellow{background-color:#FBBD08!important}.ui .background.gold{background-color:#a1882b!important}.ui .branch-tag-choice{line-height:20px}.overflow.menu .items{max-height:300px;overflow-y:auto}.overflow.menu .items .item{position:relative;cursor:pointer;display:block;border:none;height:auto;border-top:none;line-height:1em;color:rgba(0,0,0,.8);padding:.71428571em 1.14285714em!important;font-size:1rem;text-transform:none;font-weight:400;box-shadow:none;-webkit-touch-callout:none}.overflow.menu .items .item.active{font-weight:700}.overflow.menu .items .item:hover{background:rgba(0,0,0,.05);color:rgba(0,0,0,.8);z-index:13}.scrolling.menu .item.selected{font-weight:700!important}footer{margin-top:54px!important;height:40px;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .container{padding-top:10px}footer .container .fa{width:16px;text-align:center;color:#428bca}footer .container .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .container .links>:first-child{border-left:none}footer .ui.language .menu{max-height:500px;overflow-y:auto;margin-bottom:7px}.hide{display:none}.center{text-align:center}.img-1{width:2px!important;height:2px!important}.img-2{width:4px!important;height:4px!important}.img-3{width:6px!important;height:6px!important}.img-4{width:8px!important;height:8px!important}.img-5{width:10px!important;height:10px!important}.img-6{width:12px!important;height:12px!important}.img-7{width:14px!important;height:14px!important}.img-8{width:16px!important;height:16px!important}.img-9{width:18px!important;height:18px!important}.img-10{width:20px!important;height:20px!important}.img-11{width:22px!important;height:22px!important}.img-12{width:24px!important;height:24px!important}.img-13{width:26px!important;height:26px!important}.img-14{width:28px!important;height:28px!important}.img-15{width:30px!important;height:30px!important}.img-16{width:32px!important;height:32px!important}@media only screen and (min-width:768px){.mobile-only,.ui.button.mobile-only{display:none}.sr-mobile-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}}@media only screen and (max-width:767px){.not-mobile{display:none}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}@media only screen and (max-width:991px) and (min-width:768px){.ui.container{width:95%}}.hljs{background:inherit!important;padding:0!important}.ui.menu.new-menu{justify-content:center!important;padding-top:15px!important;margin-top:-15px!important;margin-bottom:15px!important;background-color:#FAFAFA!important;border-width:1px!important}@media only screen and (max-width:1200px){.ui.menu.new-menu{overflow-x:auto!important;justify-content:left!important;padding-bottom:5px}.ui.menu.new-menu::-webkit-scrollbar{height:8px;display:none}.ui.menu.new-menu:hover::-webkit-scrollbar{display:block}.ui.menu.new-menu::-webkit-scrollbar-track{background:rgba(0,0,0,.01)}.ui.menu.new-menu::-webkit-scrollbar-thumb{background:rgba(0,0,0,.2)}.ui.menu.new-menu:after{position:absolute;margin-top:-15px;display:block;background-image:linear-gradient(to right,rgba(255,255,255,0),#fff 100%);content:' ';right:0;height:53px;z-index:1000;width:60px;clear:none;visibility:visible}.ui.menu.new-menu a.item:last-child{padding-right:30px!important}}[v-cloak]{display:none!important}.repos-search{padding-bottom:0!important}.repos-filter{margin-top:0!important;border-bottom-width:0!important;margin-bottom:2px!important}.markdown:not(code){overflow:hidden;font-family:"Helvetica Neue",Helvetica,"Segoe UI",Arial,freesans,sans-serif;font-size:16px;line-height:1.6!important;word-wrap:break-word}.markdown:not(code).file-view{padding:2em 2em 2em!important}.markdown:not(code)>:first-child{margin-top:0!important}.markdown:not(code)>:last-child{margin-bottom:0!important}.markdown:not(code) a:not([href]){color:inherit;text-decoration:none}.markdown:not(code) .absent{color:#c00}.markdown:not(code) .anchor{position:absolute;top:0;left:0;display:block;padding-right:6px;padding-left:30px;margin-left:-30px}.markdown:not(code) .anchor:focus{outline:0}.markdown:not(code) h1,.markdown:not(code) h2,.markdown:not(code) h3,.markdown:not(code) h4,.markdown:not(code) h5,.markdown:not(code) h6{position:relative;margin-top:1em;margin-bottom:16px;font-weight:700;line-height:1.4}.markdown:not(code) h1:first-of-type,.markdown:not(code) h2:first-of-type,.markdown:not(code) h3:first-of-type,.markdown:not(code) h4:first-of-type,.markdown:not(code) h5:first-of-type,.markdown:not(code) h6:first-of-type{margin-top:0!important}.markdown:not(code) h1 .octicon-link,.markdown:not(code) h2 .octicon-link,.markdown:not(code) h3 .octicon-link,.markdown:not(code) h4 .octicon-link,.markdown:not(code) h5 .octicon-link,.markdown:not(code) h6 .octicon-link{display:none;color:#000;vertical-align:middle}.markdown:not(code) h1:hover .anchor,.markdown:not(code) h2:hover .anchor,.markdown:not(code) h3:hover .anchor,.markdown:not(code) h4:hover .anchor,.markdown:not(code) h5:hover .anchor,.markdown:not(code) h6:hover .anchor{padding-left:8px;margin-left:-30px;text-decoration:none}.markdown:not(code) h1:hover .anchor .octicon-link,.markdown:not(code) h2:hover .anchor .octicon-link,.markdown:not(code) h3:hover .anchor .octicon-link,.markdown:not(code) h4:hover .anchor .octicon-link,.markdown:not(code) h5:hover .anchor .octicon-link,.markdown:not(code) h6:hover .anchor .octicon-link{display:inline-block}.markdown:not(code) h1 code,.markdown:not(code) h1 tt,.markdown:not(code) h2 code,.markdown:not(code) h2 tt,.markdown:not(code) h3 code,.markdown:not(code) h3 tt,.markdown:not(code) h4 code,.markdown:not(code) h4 tt,.markdown:not(code) h5 code,.markdown:not(code) h5 tt,.markdown:not(code) h6 code,.markdown:not(code) h6 tt{font-size:inherit}.markdown:not(code) h1{padding-bottom:.3em;font-size:2.25em;line-height:1.2;border-bottom:1px solid #eee}.markdown:not(code) h1 .anchor{line-height:1}.markdown:not(code) h2{padding-bottom:.3em;font-size:1.75em;line-height:1.225;border-bottom:1px solid #eee}.markdown:not(code) h2 .anchor{line-height:1}.markdown:not(code) h3{font-size:1.5em;line-height:1.43}.markdown:not(code) h3 .anchor{line-height:1.2}.markdown:not(code) h4{font-size:1.25em}.markdown:not(code) h4 .anchor{line-height:1.2}.markdown:not(code) h5{font-size:1em}.markdown:not(code) h5 .anchor{line-height:1.1}.markdown:not(code) h6{font-size:1em;color:#777}.markdown:not(code) h6 .anchor{line-height:1.1}.markdown:not(code) blockquote,.markdown:not(code) dl,.markdown:not(code) ol,.markdown:not(code) p,.markdown:not(code) pre,.markdown:not(code) table,.markdown:not(code) ul{margin-top:0;margin-bottom:16px}.markdown:not(code) blockquote{margin-left:0}.markdown:not(code) hr{height:4px;padding:0;margin:16px 0;background-color:#e7e7e7;border:0 none}.markdown:not(code) ol,.markdown:not(code) ul{padding-left:2em}.markdown:not(code) ol.no-list,.markdown:not(code) ul.no-list{padding:0;list-style-type:none}.markdown:not(code) ol ol,.markdown:not(code) ol ul,.markdown:not(code) ul ol,.markdown:not(code) ul ul{margin-top:0;margin-bottom:0}.markdown:not(code) ol ol,.markdown:not(code) ul ol{list-style-type:lower-roman}.markdown:not(code) li>p{margin-top:0}.markdown:not(code) dl{padding:0}.markdown:not(code) dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:700}.markdown:not(code) dl dd{padding:0 16px;margin-bottom:16px}.markdown:not(code) blockquote{padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown:not(code) blockquote>:first-child{margin-top:0}.markdown:not(code) blockquote>:last-child{margin-bottom:0}.markdown:not(code) table{width:auto;overflow:auto;word-break:normal;word-break:keep-all}.markdown:not(code) table th{font-weight:700}.markdown:not(code) table td,.markdown:not(code) table th{padding:6px 13px!important;border:1px solid #ddd!important}.markdown:not(code) table tr{background-color:#fff;border-top:1px solid #ccc}.markdown:not(code) table tr:nth-child(2n){background-color:#f8f8f8}.markdown:not(code) img{max-width:100%;box-sizing:border-box}.markdown:not(code) .emoji{max-width:none}.markdown:not(code) span.frame{display:block;overflow:hidden}.markdown:not(code) span.frame>span{display:block;float:left;width:auto;padding:7px;margin:13px 0 0;overflow:hidden;border:1px solid #ddd}.markdown:not(code) span.frame span img{display:block;float:left}.markdown:not(code) span.frame span span{display:block;padding:5px 0 0;clear:both;color:#333}.markdown:not(code) span.align-center{display:block;overflow:hidden;clear:both}.markdown:not(code) span.align-center>span{display:block;margin:13px auto 0;overflow:hidden;text-align:center}.markdown:not(code) span.align-center span img{margin:0 auto;text-align:center}.markdown:not(code) span.align-right{display:block;overflow:hidden;clear:both}.markdown:not(code) span.align-right>span{display:block;margin:13px 0 0;overflow:hidden;text-align:right}.markdown:not(code) span.align-right span img{margin:0;text-align:right}.markdown:not(code) span.float-left{display:block;float:left;margin-right:13px;overflow:hidden}.markdown:not(code) span.float-left span{margin:13px 0 0}.markdown:not(code) span.float-right{display:block;float:right;margin-left:13px;overflow:hidden}.markdown:not(code) span.float-right>span{display:block;margin:13px auto 0;overflow:hidden;text-align:right}.markdown:not(code) code,.markdown:not(code) tt{padding:0;padding-top:.2em;padding-bottom:.2em;margin:0;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px}.markdown:not(code) code:after,.markdown:not(code) code:before,.markdown:not(code) tt:after,.markdown:not(code) tt:before{letter-spacing:-.2em;content:"\00a0"}.markdown:not(code) code br,.markdown:not(code) tt br{display:none}.markdown:not(code) del code{text-decoration:inherit}.markdown:not(code) pre>code{padding:0;margin:0;font-size:100%;word-break:normal;white-space:pre;background:0 0;border:0}.markdown:not(code) .highlight{margin-bottom:16px}.markdown:not(code) .highlight pre,.markdown:not(code) pre{padding:16px;overflow:auto;font-size:85%;line-height:1.45;background-color:#f7f7f7;border-radius:3px}.markdown:not(code) .highlight pre{margin-bottom:0;word-break:normal}.markdown:not(code) pre{word-wrap:normal}.markdown:not(code) pre code,.markdown:not(code) pre tt{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background-color:transparent;border:0}.markdown:not(code) pre code:after,.markdown:not(code) pre code:before,.markdown:not(code) pre tt:after,.markdown:not(code) pre tt:before{content:normal}.markdown:not(code) kbd{display:inline-block;padding:3px 5px;font-size:11px;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:solid 1px #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.markdown:not(code) input[type=checkbox]{vertical-align:middle!important}.markdown:not(code) .csv-data td,.markdown:not(code) .csv-data th{padding:5px;overflow:hidden;font-size:12px;line-height:1;text-align:left;white-space:nowrap}.markdown:not(code) .csv-data .blob-num{padding:10px 8px 9px;text-align:right;background:#fff;border:0}.markdown:not(code) .csv-data tr{border-top:0}.markdown:not(code) .csv-data th{font-weight:700;background:#f8f8f8;border-top:0}.markdown:not(code) .ui.list .list,.markdown:not(code) ol.ui.list ol,.markdown:not(code) ul.ui.list ul{padding-left:2em}.home{padding-bottom:80px}.home .logo{max-width:220px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif,'Microsoft YaHei'}@media only screen and (max-width:767px){.home .hero h1{font-size:3.5em}.home .hero h2{font-size:2em}}@media only screen and (min-width:768px){.home .hero h1{font-size:5.5em}.home .hero h2{font-size:3em}}.home .hero .octicon{color:#5aa509;font-size:40px;width:50px}.home .hero.header{font-size:20px}.home p.large{font-size:16px}.home .stackable{padding-top:30px}.home a{color:#5aa509}.signup{padding-top:15px;padding-bottom:80px}.install{padding-top:45px;padding-bottom:80px}.install form label{text-align:right;width:320px!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:335px!important}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.ui.attached.header .right .button{padding:8px 10px;font-weight:400}#create-page-form form{margin:auto}#create-page-form form .ui.message{text-align:center}@media only screen and (min-width:768px){#create-page-form form{width:800px!important}#create-page-form form .header{padding-left:280px!important}#create-page-form form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}#create-page-form form .help{margin-left:265px!important}#create-page-form form .optional .title{margin-left:250px!important}#create-page-form form input,#create-page-form form textarea{width:50%!important}}@media only screen and (max-width:767px){#create-page-form form .optional .title{margin-left:15px}#create-page-form form .inline.field>label{display:block}}.signin .oauth2 div{display:inline-block}.signin .oauth2 div p{margin:10px 5px 0 0;float:left}.signin .oauth2 a{margin-right:3px}.signin .oauth2 a:last-child{margin-right:0}.signin .oauth2 img{width:32px;height:32px}.signin .oauth2 img.openidConnect{width:auto}.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{margin:auto}.user.activate form .ui.message,.user.forgot.password form .ui.message,.user.reset.password form .ui.message,.user.signin form .ui.message,.user.signup form .ui.message{text-align:center}@media only screen and (min-width:768px){.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{width:800px!important}.user.activate form .header,.user.forgot.password form .header,.user.reset.password form .header,.user.signin form .header,.user.signup form .header{padding-left:280px!important}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.user.activate form .help,.user.forgot.password form .help,.user.reset.password form .help,.user.signin form .help,.user.signup form .help{margin-left:265px!important}.user.activate form .optional .title,.user.forgot.password form .optional .title,.user.reset.password form .optional .title,.user.signin form .optional .title,.user.signup form .optional .title{margin-left:250px!important}.user.activate form input,.user.activate form textarea,.user.forgot.password form input,.user.forgot.password form textarea,.user.reset.password form input,.user.reset.password form textarea,.user.signin form input,.user.signin form textarea,.user.signup form input,.user.signup form textarea{width:50%!important}}@media only screen and (max-width:767px){.user.activate form .optional .title,.user.forgot.password form .optional .title,.user.reset.password form .optional .title,.user.signin form .optional .title,.user.signup form .optional .title{margin-left:15px}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{display:block}}.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{width:700px!important}.user.activate form .header,.user.forgot.password form .header,.user.reset.password form .header,.user.signin form .header,.user.signup form .header{padding-left:0!important;text-align:center}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{width:200px!important}.repository.new.fork form,.repository.new.migrate form,.repository.new.repo form{margin:auto}.repository.new.fork form .ui.message,.repository.new.migrate form .ui.message,.repository.new.repo form .ui.message{text-align:center}@media only screen and (min-width:768px){.repository.new.fork form,.repository.new.migrate form,.repository.new.repo form{width:800px!important}.repository.new.fork form .header,.repository.new.migrate form .header,.repository.new.repo form .header{padding-left:280px!important}.repository.new.fork form .inline.field>label,.repository.new.migrate form .inline.field>label,.repository.new.repo form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help,.repository.new.migrate form .help,.repository.new.repo form .help{margin-left:265px!important}.repository.new.fork form .optional .title,.repository.new.migrate form .optional .title,.repository.new.repo form .optional .title{margin-left:250px!important}.repository.new.fork form input,.repository.new.fork form textarea,.repository.new.migrate form input,.repository.new.migrate form textarea,.repository.new.repo form input,.repository.new.repo form textarea{width:50%!important}}@media only screen and (max-width:767px){.repository.new.fork form .optional .title,.repository.new.migrate form .optional .title,.repository.new.repo form .optional .title{margin-left:15px}.repository.new.fork form .inline.field>label,.repository.new.migrate form .inline.field>label,.repository.new.repo form .inline.field>label{display:block}}.repository.new.fork form .dropdown .dropdown.icon,.repository.new.migrate form .dropdown .dropdown.icon,.repository.new.repo form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text,.repository.new.migrate form .dropdown .text,.repository.new.repo form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i,.repository.new.migrate form .dropdown .text i,.repository.new.repo form .dropdown .text i{margin-right:0!important}.repository.new.fork form .header,.repository.new.migrate form .header,.repository.new.repo form .header{padding-left:0!important;text-align:center}.repository.new.repo .ui.form .selection.dropdown:not(.owner){width:50%!important}@media only screen and (min-width:768px){.repository.new.repo .ui.form #auto-init{margin-left:265px!important}}.new.webhook form .help{margin-left:25px}.new.webhook .events.fields .column{padding-left:40px}.githook textarea{font-family:monospace}.repository{padding-top:15px;padding-bottom:80px}.repository .header-grid{padding-top:5px;padding-bottom:5px}.repository .header-grid .ui.compact.menu{margin-left:1rem}.repository .header-grid .ui.header{margin-top:0}.repository .header-grid .mega-octicon{width:30px;font-size:30px}.repository .header-grid .ui.huge.breadcrumb{font-weight:400;font-size:1.7rem}.repository .header-grid .fork-flag{margin-left:38px;margin-top:3px;display:block;font-size:12px;white-space:nowrap}.repository .header-grid .octicon.octicon-repo-forked{margin-top:-1px;font-size:15px}.repository .header-grid .button{margin-top:2px;margin-bottom:2px}.repository .tabs .navbar{justify-content:initial}.repository .navbar{display:flex;justify-content:space-between}.repository .navbar .ui.label{margin-top:-2px;margin-left:7px;padding:3px 5px}.repository .owner.dropdown{min-width:40%!important}.repository #file-buttons{margin-left:auto!important;font-weight:400}.repository #file-buttons .ui.button{padding:8px 10px;font-weight:400}.repository .metas .menu{max-height:300px;overflow-x:auto}.repository .metas .ui.list .hide{display:none!important}.repository .metas .ui.list .item{padding:0}.repository .metas .ui.list .label.color{padding:0 8px;margin-right:5px}.repository .metas .ui.list a{margin:2px 0}.repository .metas .ui.list a .text{color:#444}.repository .metas .ui.list a .text:hover{color:#000}.repository .header-wrapper{background-color:#FAFAFA;margin-top:-15px;padding-top:15px}.repository .header-wrapper .ui.tabs.divider{border-bottom:none}.repository .header-wrapper .ui.tabular .octicon{margin-right:5px}.repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin-left:-5px;margin-right:-7px}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .dropdown.item{margin:1px;padding-right:0}.repository .select-label .item{max-width:250px;overflow:hidden;text-overflow:ellipsis}.repository .select-label .desc{padding-left:16px}.repository .ui.tabs.container{margin-top:14px;margin-bottom:0}.repository .ui.tabs.container .ui.menu{border-bottom:none}.repository .ui.tabs.divider{margin-top:0;margin-bottom:20px}.repository #clone-panel{width:350px}.repository #clone-panel input{border-radius:0;padding:5px 10px}.repository #clone-panel .clone.button{font-size:13px;padding:0 5px}.repository #clone-panel .clone.button:first-child{border-radius:.28571429rem 0 0 .28571429rem}.repository #clone-panel .icon.button{padding:0 10px}.repository #clone-panel .dropdown .menu{right:0!important;left:auto!important}.repository.file.list .repo-description{display:flex;justify-content:space-between;align-items:center}.repository.file.list #repo-desc{font-size:1.2em}.repository.file.list .choose.reference .header .icon{font-size:1.4em}.repository.file.list .repo-path .divider,.repository.file.list .repo-path .section{display:inline}.repository.file.list #file-buttons{font-weight:400}.repository.file.list #file-buttons .ui.button{padding:8px 10px;font-weight:400}.repository.file.list #repo-files-table thead th{padding-top:8px;padding-bottom:5px;font-weight:400}.repository.file.list #repo-files-table thead th:first-child{display:block;position:relative;width:325%}.repository.file.list #repo-files-table thead .ui.avatar{margin-bottom:5px}.repository.file.list #repo-files-table tbody .octicon{margin-left:3px;margin-right:5px;color:#777}.repository.file.list #repo-files-table tbody .octicon.octicon-mail-reply{margin-right:10px}.repository.file.list #repo-files-table tbody .octicon.octicon-file-directory,.repository.file.list #repo-files-table tbody .octicon.octicon-file-submodule{color:#1e70bf}.repository.file.list #repo-files-table td{padding-top:8px;padding-bottom:8px}.repository.file.list #repo-files-table td.message .isSigned{cursor:default}.repository.file.list #repo-files-table tr:hover{background-color:#ffE}.repository.file.list #repo-files-table .jumpable-path{color:#888}.repository.file.list .non-diff-file-content .header .icon{font-size:1em}.repository.file.list .non-diff-file-content .header .file-actions{margin-top:0;margin-bottom:-5px;padding-left:20px}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon{display:inline-block;padding:5px;margin-left:5px;line-height:1;color:#767676;vertical-align:middle;background:0 0;border:0;outline:0}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon:hover{color:#4078c0}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon-danger:hover{color:#bd2c00}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon.disabled{color:#bbb;cursor:default}.repository.file.list .non-diff-file-content .header .file-actions #delete-file-form{display:inline-block}.repository.file.list .non-diff-file-content .view-raw{padding:5px}.repository.file.list .non-diff-file-content .view-raw *{max-width:100%}.repository.file.list .non-diff-file-content .view-raw img{padding:5px 5px 0 5px}.repository.file.list .non-diff-file-content .plain-text{padding:1em 2em 1em 2em}.repository.file.list .non-diff-file-content .code-view *{font-size:12px;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:20px}.repository.file.list .non-diff-file-content .code-view table{width:100%}.repository.file.list .non-diff-file-content .code-view .lines-num{vertical-align:top;text-align:right;color:#999;background:#f5f5f5;width:1%;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}.repository.file.list .non-diff-file-content .code-view .lines-num span{line-height:20px;padding:0 10px;cursor:pointer;display:block}.repository.file.list .non-diff-file-content .code-view .lines-code,.repository.file.list .non-diff-file-content .code-view .lines-num{padding:0}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs,.repository.file.list .non-diff-file-content .code-view .lines-code ol,.repository.file.list .non-diff-file-content .code-view .lines-code pre,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs,.repository.file.list .non-diff-file-content .code-view .lines-num ol,.repository.file.list .non-diff-file-content .code-view .lines-num pre{background-color:#fff;margin:0;padding:0!important}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li,.repository.file.list .non-diff-file-content .code-view .lines-code ol li,.repository.file.list .non-diff-file-content .code-view .lines-code pre li,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li,.repository.file.list .non-diff-file-content .code-view .lines-num ol li,.repository.file.list .non-diff-file-content .code-view .lines-num pre li{display:block;width:100%}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li.active,.repository.file.list .non-diff-file-content .code-view .lines-code ol li.active,.repository.file.list .non-diff-file-content .code-view .lines-code pre li.active,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li.active,.repository.file.list .non-diff-file-content .code-view .lines-num ol li.active,.repository.file.list .non-diff-file-content .code-view .lines-num pre li.active{background:#ffd}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li:before,.repository.file.list .non-diff-file-content .code-view .lines-code ol li:before,.repository.file.list .non-diff-file-content .code-view .lines-code pre li:before,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li:before,.repository.file.list .non-diff-file-content .code-view .lines-num ol li:before,.repository.file.list .non-diff-file-content .code-view .lines-num pre li:before{content:' '}.repository.file.list .non-diff-file-content .code-view .active{background:#ffd}.repository.file.list .sidebar{padding-left:0}.repository.file.list .sidebar .octicon{width:16px}.repository.file.editor .treepath{width:100%}.repository.file.editor .treepath input{vertical-align:middle;box-shadow:rgba(0,0,0,.0745098) 0 1px 2px inset;width:inherit;padding:7px 8px;margin-right:5px}.repository.file.editor .tabular.menu .octicon{margin-right:5px}.repository.file.editor .commit-form-wrapper{padding-left:64px}.repository.file.editor .commit-form-wrapper .commit-avatar{float:left;margin-left:-64px;width:3em;height:auto}.repository.file.editor .commit-form-wrapper .commit-form{position:relative;padding:15px;margin-bottom:10px;border:1px solid #ddd;border-radius:3px}.repository.file.editor .commit-form-wrapper .commit-form:after,.repository.file.editor .commit-form-wrapper .commit-form:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.file.editor .commit-form-wrapper .commit-form:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.file.editor .commit-form-wrapper .commit-form:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.file.editor .commit-form-wrapper .commit-form:after{border-right-color:#fff}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .branch-name{display:inline-block;padding:3px 6px;font:12px Consolas,"Liberation Mono",Menlo,Courier,monospace;color:rgba(0,0,0,.65);background-color:rgba(209,227,237,.45);border-radius:3px}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input{position:relative;margin-left:25px}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input input{width:240px!important;padding-left:26px!important}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .octicon-git-branch{position:absolute;top:9px;left:10px;color:#b0c4ce}.repository.options #interval{width:100px!important;min-width:100px}.repository.options .danger .item{padding:20px 15px}.repository.options .danger .ui.divider{margin:0}.repository.new.issue .comment.form .comment .avatar{width:3em}.repository.new.issue .comment.form .content{margin-left:4em}.repository.new.issue .comment.form .content:after,.repository.new.issue .comment.form .content:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.new.issue .comment.form .content:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.new.issue .comment.form .content:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.new.issue .comment.form .content:after{border-right-color:#fff}.repository.new.issue .comment.form .content .markdown{font-size:14px}.repository.new.issue .comment.form .metas{min-width:220px}.repository.new.issue .comment.form .metas .filter.menu{max-height:300px;overflow-x:auto}.repository.view.issue .title{padding-bottom:0!important}.repository.view.issue .title h1{font-weight:300;font-size:2.3rem;margin-bottom:5px}.repository.view.issue .title h1 .ui.input{font-size:.5em;vertical-align:top;width:50%;min-width:600px}.repository.view.issue .title h1 .ui.input input{font-size:1.5em;padding:6px 10px}.repository.view.issue .title .index{font-weight:300;color:#aaa;letter-spacing:-1px}.repository.view.issue .title .label{margin-right:10px}.repository.view.issue .title .edit-zone{margin-top:10px}.repository.view.issue .pull-desc code{color:#0166E6}.repository.view.issue .pull.tabular.menu{margin-bottom:10px}.repository.view.issue .pull.tabular.menu .octicon{margin-right:5px}.repository.view.issue .pull.tab.segment{border:none;padding:0;padding-top:10px;box-shadow:none;background-color:inherit}.repository.view.issue .pull .merge.box .avatar{margin-left:10px;margin-top:10px}.repository.view.issue .comment-list:before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:96px;width:2px;background-color:#f3f3f3;z-index:-1}.repository.view.issue .comment-list .comment .avatar{width:3em}.repository.view.issue .comment-list .comment .tag{color:#767676;margin-top:3px;padding:2px 5px;font-size:12px;border:1px solid rgba(0,0,0,.1);border-radius:3px}.repository.view.issue .comment-list .comment .actions .item{float:left}.repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px}.repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px}.repository.view.issue .comment-list .comment .content{margin-left:4em}.repository.view.issue .comment-list .comment .content>.header{font-weight:400;padding:auto 15px;position:relative;color:#767676;background-color:#f7f7f7;border-bottom:1px solid #eee;border-top-left-radius:3px;border-top-right-radius:3px}.repository.view.issue .comment-list .comment .content>.header:after,.repository.view.issue .comment-list .comment .content>.header:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.view.issue .comment-list .comment .content>.header:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.view.issue .comment-list .comment .content>.header:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.view.issue .comment-list .comment .content>.header .text{max-width:78%;padding-top:10px;padding-bottom:10px}.repository.view.issue .comment-list .comment .content .markdown{font-size:14px}.repository.view.issue .comment-list .comment .content .no-content{color:#767676;font-style:italic}.repository.view.issue .comment-list .comment .content>.bottom.segment{background:#f3f4f5}.repository.view.issue .comment-list .comment .content>.bottom.segment .ui.images::after{clear:both;content:' ';display:block}.repository.view.issue .comment-list .comment .content>.bottom.segment a{display:block;float:left;margin:5px;padding:5px;height:150px;border:solid 1px #eee;border-radius:3px;max-width:150px;background-color:#fff}.repository.view.issue .comment-list .comment .content>.bottom.segment a:before{content:' ';display:inline-block;height:100%;vertical-align:middle}.repository.view.issue .comment-list .comment .content>.bottom.segment .ui.image{max-height:100%;width:auto;margin:0;vertical-align:middle}.repository.view.issue .comment-list .comment .content>.bottom.segment span.ui.image{font-size:128px;color:#000}.repository.view.issue .comment-list .comment .content>.bottom.segment span.ui.image:hover{color:#000}.repository.view.issue .comment-list .comment .ui.form .field:first-child{clear:none}.repository.view.issue .comment-list .comment .ui.form .tab.segment{border:none;padding:0;padding-top:10px}.repository.view.issue .comment-list .comment .ui.form textarea{height:200px;font-family:Consolas,monospace}.repository.view.issue .comment-list .comment .edit.buttons{margin-top:10px}.repository.view.issue .comment-list .event{position:relative;margin:15px 0 15px 79px;padding-left:25px}.repository.view.issue .comment-list .event .octicon{width:30px;float:left;text-align:center}.repository.view.issue .comment-list .event .octicon.octicon-circle-slash{margin-top:5px;margin-left:-34.5px;font-size:20px;color:#bd2c00}.repository.view.issue .comment-list .event .octicon.octicon-primitive-dot{margin-left:-28.5px;margin-right:-1px;font-size:30px;color:#6cc644}.repository.view.issue .comment-list .event .octicon.octicon-bookmark{margin-top:3px;margin-left:-31px;margin-right:-1px;font-size:25px}.repository.view.issue .comment-list .event .detail{font-size:.9rem;margin-top:5px;margin-left:35px}.repository.view.issue .comment-list .event .detail .octicon.octicon-git-commit{margin-top:2px}.repository.view.issue .ui.segment.metas{margin-top:-3px}.repository.view.issue .ui.participants img{margin-top:5px;margin-right:5px}.repository .comment.form .ui.comments{margin-top:-12px;max-width:100%}.repository .comment.form .content .field:first-child{clear:none}.repository .comment.form .content .form:after,.repository .comment.form .content .form:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository .comment.form .content .form:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository .comment.form .content .form:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository .comment.form .content .form:after{border-right-color:#fff}.repository .comment.form .content .tab.segment{border:none;padding:0;padding-top:10px}.repository .comment.form .content textarea{height:200px;font-family:Consolas,monospace}.repository .label.list{list-style:none;padding-top:15px}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .label.list .item .ui.label{font-size:1em}.repository .milestone.list{list-style:none;padding-top:15px}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.new.milestone #deadline{width:150px}.repository.compare.pull .choose.branch .octicon{padding-right:10px}.repository.compare.pull .comment.form .content:after,.repository.compare.pull .comment.form .content:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.compare.pull .comment.form .content:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.compare.pull .comment.form .content:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.compare.pull .comment.form .content:after{border-right-color:#fff}.repository .filter.dropdown .menu{margin-top:1px!important}.repository.commits .header .search input{font-weight:400;padding:5px 10px}.repository #commits-table thead th:first-of-type{padding-left:15px}.repository #commits-table thead .sha{width:140px}.repository #commits-table thead .shatd{text-align:center}.repository #commits-table td.sha .sha.label{margin:0}.repository #commits-table.ui.basic.striped.table tbody tr:nth-child(2n){background-color:rgba(0,0,0,.02)!important}.repository #commits-table td.sha .sha.label.isSigned,.repository #repo-files-table .sha.label.isSigned{border:1px solid #BBB}.repository #commits-table td.sha .sha.label.isSigned .detail.icon,.repository #repo-files-table .sha.label.isSigned .detail.icon{background:#FAFAFA;margin:-6px -10px -4px 0;padding:5px 3px 5px 6px;border-left:1px solid #BBB;border-top-left-radius:0;border-bottom-left-radius:0}.repository #commits-table td.sha .sha.label.isSigned.isVerified,.repository #repo-files-table .sha.label.isSigned.isVerified{border:1px solid #21BA45;background:#21BA4518}.repository #commits-table td.sha .sha.label.isSigned.isVerified .detail.icon,.repository #repo-files-table .sha.label.isSigned.isVerified .detail.icon{border-left:1px solid #21BA4580}.repository .diff-detail-box{margin:15px 0;line-height:30px}.repository .diff-detail-box ol{clear:both;padding-left:0;margin-top:5px;margin-bottom:28px}.repository .diff-detail-box ol li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #DDD;padding-left:6px}.repository .diff-detail-box span.status{display:inline-block;width:12px;height:12px;margin-right:8px;vertical-align:middle}.repository .diff-detail-box span.status.modify{background-color:#f0db88}.repository .diff-detail-box span.status.add{background-color:#b4e2b4}.repository .diff-detail-box span.status.del{background-color:#e9aeae}.repository .diff-detail-box span.status.rename{background-color:#dad8ff}.repository .diff-detail-box .ui.right{margin-bottom:15px}.repository .diff-box .header{display:flex;align-items:center}.repository .diff-box .header .count{margin-right:12px;font-size:13px;flex:0 0 auto}.repository .diff-box .header .count .bar{background-color:#bd2c00;height:12px;width:40px;display:inline-block;margin:2px 4px 0 4px;vertical-align:text-top}.repository .diff-box .header .count .bar .add{background-color:#55a532;height:12px}.repository .diff-box .header .file{flex:1;color:#888;word-break:break-all}.repository .diff-box .header .button{margin:-5px 0 -5px 12px;padding:8px 10px;flex:0 0 auto}.repository .diff-file-box .header{background-color:#f7f7f7}.repository .diff-file-box .file-body.file-code .lines-num{text-align:right;color:#A7A7A7;background:#fafafa;width:1%;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;vertical-align:top}.repository .diff-file-box .file-body.file-code .lines-num span.fold{display:block;text-align:center}.repository .diff-file-box .file-body.file-code .lines-num-old{border-right:1px solid #DDD}.repository .diff-file-box .code-diff{font-size:12px}.repository .diff-file-box .code-diff td{padding:0;padding-left:10px;border-top:none}.repository .diff-file-box .code-diff pre{margin:0}.repository .diff-file-box .code-diff .lines-num{border-color:#d4d4d5;border-right-width:1px;border-right-style:solid;padding:0 5px}.repository .diff-file-box .code-diff tbody tr td.halfwidth{width:49%}.repository .diff-file-box .code-diff tbody tr td.tag-code,.repository .diff-file-box .code-diff tbody tr.tag-code td{background-color:#F0F0F0!important;border-color:#D2CECE!important;padding-top:8px;padding-bottom:8px}.repository .diff-file-box .code-diff tbody tr .removed-code{background-color:#f99}.repository .diff-file-box .code-diff tbody tr .added-code{background-color:#9f9}.repository .diff-file-box .code-diff-unified tbody tr.del-code td{background-color:#ffe0e0!important;border-color:#f1c0c0!important}.repository .diff-file-box .code-diff-unified tbody tr.add-code td{background-color:#d6fcd6!important;border-color:#c1e9c1!important}.repository .diff-file-box .code-diff-split table,.repository .diff-file-box .code-diff-split tbody{width:100%}.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(1),.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(2),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(3),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(4){background-color:#fafafa}.repository .diff-file-box .code-diff-split tbody tr td.del-code,.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(1),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(2){background-color:#ffe0e0!important;border-color:#f1c0c0!important}.repository .diff-file-box .code-diff-split tbody tr td.add-code,.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(3),.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(4){background-color:#d6fcd6!important;border-color:#c1e9c1!important}.repository .diff-file-box .code-diff-split tbody tr td:nth-child(3){border-left-width:1px;border-left-style:solid}.repository .diff-file-box.file-content{clear:right}.repository .diff-file-box.file-content img{max-width:100%;padding:5px 5px 0 5px}.repository .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}.repository .repo-search-result{padding-top:10px;padding-bottom:10px}.repository .repo-search-result .lines-num a{color:inherit}.repository.quickstart .guide .item{padding:1em}.repository.quickstart .guide .item small{font-weight:400}.repository.quickstart .guide .clone.button:first-child{border-radius:.28571429rem 0 0 .28571429rem}.repository.quickstart .guide .ui.action.small.input{width:100%}.repository.quickstart .guide #repo-clone-url{border-radius:0;padding:5px 10px;font-size:1.2em}.repository.release #release-list{border-top:1px solid #DDD;margin-top:20px;padding-top:15px}.repository.release #release-list>li{list-style:none}.repository.release #release-list>li .detail,.repository.release #release-list>li .meta{padding-top:30px;padding-bottom:40px}.repository.release #release-list>li .meta{text-align:right;position:relative}.repository.release #release-list>li .meta .tag:not(.icon){display:block;margin-top:15px}.repository.release #release-list>li .meta .commit{display:block;margin-top:10px}.repository.release #release-list>li .detail{border-left:1px solid #DDD}.repository.release #release-list>li .detail .author img{margin-bottom:-3px}.repository.release #release-list>li .detail .download{margin-top:20px}.repository.release #release-list>li .detail .download>a .octicon{margin-left:5px;margin-right:5px}.repository.release #release-list>li .detail .download .list{padding-left:0;border-top:1px solid #eee}.repository.release #release-list>li .detail .download .list li{list-style:none;display:block;padding-top:8px;padding-bottom:8px;border-bottom:1px solid #eee}.repository.release #release-list>li .detail .dot{width:9px;height:9px;background-color:#ccc;z-index:999;position:absolute;display:block;left:-5px;top:40px;border-radius:6px;border:1px solid #FFF}.repository.new.release .target{min-width:500px}.repository.new.release .target #tag-name{margin-top:-4px}.repository.new.release .target .at{margin-left:-5px;margin-right:5px}.repository.new.release .target .dropdown.icon{margin:0;padding-top:3px}.repository.new.release .target .selection.dropdown{padding-top:10px;padding-bottom:10px}.repository.new.release .prerelease.field{margin-bottom:0}.repository.forks .list{margin-top:0}.repository.forks .list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px solid #DDD}.repository.forks .list .item .ui.avatar{float:left;margin-right:5px}.repository.forks .list .item .link{padding-top:5px}.repository.wiki.start .ui.segment{padding-top:70px;padding-bottom:100px}.repository.wiki.start .ui.segment .mega-octicon{font-size:48px}.repository.wiki.new .CodeMirror .CodeMirror-code{font-family:Consolas,monospace}.repository.wiki.new .CodeMirror .CodeMirror-code .cm-comment{background:inherit}.repository.wiki.new .editor-preview{background-color:#fff}.repository.wiki.view .choose.page{margin-top:-5px}.repository.wiki.view .ui.sub.header{text-transform:none}.repository.wiki.view>.markdown{padding:15px 30px}.repository.wiki.view>.markdown h1:first-of-type,.repository.wiki.view>.markdown h2:first-of-type,.repository.wiki.view>.markdown h3:first-of-type,.repository.wiki.view>.markdown h4:first-of-type,.repository.wiki.view>.markdown h5:first-of-type,.repository.wiki.view>.markdown h6:first-of-type{margin-top:0}@media only screen and (max-width:767px){.repository.wiki .dividing.header .stackable.grid .button{margin-top:2px;margin-bottom:2px}}.repository.settings.collaboration .collaborator.list{padding:0}.repository.settings.collaboration .collaborator.list>.item{margin:0;line-height:2em}.repository.settings.collaboration .collaborator.list>.item:not(:last-child){border-bottom:1px solid #DDD}.repository.settings.collaboration #repo-collab-form #search-user-box .results{left:7px}.repository.settings.collaboration #repo-collab-form .ui.button{margin-left:5px;margin-top:-3px}.repository.settings.branches .protected-branches .selection.dropdown{width:300px}.repository.settings.branches .protected-branches .item{border:1px solid #eaeaea;padding:10px 15px}.repository.settings.branches .protected-branches .item:not(:last-child){border-bottom:0}.repository.settings.branches .branch-protection .help{margin-left:26px;padding-top:0}.repository.settings.branches .branch-protection .fields{margin-left:20px;display:block}.repository.settings.branches .branch-protection .whitelist{margin-left:26px}.repository.settings.branches .branch-protection .whitelist .dropdown img{display:inline-block}.repository.settings.webhook .events .column{padding-bottom:0}.repository.settings.webhook .events .help{font-size:13px;margin-left:26px;padding-top:0}.repository .ui.attached.isSigned.isVerified:not(.positive){border-left:1px solid #A3C293;border-right:1px solid #A3C293}.repository .ui.attached.isSigned.isVerified.top:not(.positive){border-top:1px solid #A3C293}.repository .ui.attached.isSigned.isVerified:not(.positive):last-child{border-bottom:1px solid #A3C293}.repository .ui.segment.sub-menu{padding:7px;line-height:0}.repository .ui.segment.sub-menu .list{width:100%;display:flex}.repository .ui.segment.sub-menu .list .item{width:100%;border-radius:3px}.repository .ui.segment.sub-menu .list .item a{color:#000}.repository .ui.segment.sub-menu .list .item a:hover{color:#666}.repository .ui.segment.sub-menu .list .item.active{background:rgba(0,0,0,.05)}.repository .segment.reactions.dropdown .menu,.repository .select-reaction.dropdown .menu{right:0!important;left:auto!important}.repository .segment.reactions.dropdown .menu>.header,.repository .select-reaction.dropdown .menu>.header{margin:.75rem 0 .5rem}.repository .segment.reactions.dropdown .menu>.item,.repository .select-reaction.dropdown .menu>.item{float:left;padding:.5rem .5rem!important}.repository .segment.reactions.dropdown .menu>.item img.emoji,.repository .select-reaction.dropdown .menu>.item img.emoji{margin-right:0}.repository .segment.reactions{padding:.3em 1em}.repository .segment.reactions .ui.label{padding:.4em}.repository .segment.reactions .ui.label.disabled{cursor:default}.repository .segment.reactions .ui.label>img{height:1.5em!important}.repository .segment.reactions .select-reaction{float:none}.repository .segment.reactions .select-reaction:not(.active) a{display:none}.repository .segment.reactions:hover .select-reaction a{display:block}.user-cards .list{padding:0}.user-cards .list .item{list-style:none;width:32%;margin:10px 10px 10px 0;padding-bottom:14px;float:left}.user-cards .list .item .avatar{width:48px;height:48px;float:left;display:block;margin-right:10px}.user-cards .list .item .name{margin-top:0;margin-bottom:0;font-weight:400}.user-cards .list .item .meta{margin-top:5px}#search-repo-box .results .result .image,#search-user-box .results .result .image{float:left;margin-right:8px;width:2em;height:2em}#search-repo-box .results .result .content,#search-user-box .results .result .content{margin:6px 0}#issue-actions{display:none}.issue.list{list-style:none;padding-top:15px}.issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.issue.list>.item .title:hover{color:#000}.issue.list>.item .comment{padding-right:10px;color:#666}.issue.list>.item .desc{padding-top:5px;color:#999}.issue.list>.item .desc .checklist{padding-left:5px}.issue.list>.item .desc .checklist .progress-bar{margin-left:2px;width:80px;height:6px;display:inline-block;background-color:#eee;overflow:hidden;border-radius:3px;vertical-align:2px!important}.issue.list>.item .desc .checklist .progress-bar .progress{background-color:#ccc;display:block;height:100%}.issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.issue.list>.item .desc a.milestone:hover{color:#000!important}.issue.list>.item .desc .assignee{margin-top:-5px;margin-right:5px}.page.buttons{padding-top:15px}.ui.form .dropzone{width:100%;margin-bottom:10px;border:2px dashed #0087F7;box-shadow:none!important}.ui.form .dropzone .dz-error-message{top:140px}.settings .content{margin-top:2px}.settings .content .segment,.settings .content>.header{box-shadow:0 1px 2px 0 rgba(34,36,38,.15)}.settings .list>.item .green{color:#21BA45!important}.settings .list>.item:not(:first-child){border-top:1px solid #eaeaea;padding:1rem;margin:15px -1rem -1rem -1rem}.settings .list>.item>.mega-octicon{display:table-cell}.settings .list>.item>.mega-octicon+.content{display:table-cell;padding:0 0 0 .5em;vertical-align:top}.settings .list>.item .info{margin-top:10px}.settings .list>.item .info .tab.segment{border:none;padding:10px 0 0}.settings .list.key .meta{padding-top:5px;color:#666}.settings .list.email>.item:not(:first-child){min-height:60px}.settings .list.collaborator>.item{padding:0}.ui.vertical.menu .header.item{font-size:1.1em;background:#f0f0f0}.edit-label.modal .form .column,.new-label.segment .form .column{padding-right:0}.edit-label.modal .form .buttons,.new-label.segment .form .buttons{margin-left:auto;padding-top:15px}.edit-label.modal .form .color.picker.column,.new-label.segment .form .color.picker.column{width:auto}.edit-label.modal .form .color.picker.column .color-picker,.new-label.segment .form .color.picker.column .color-picker{height:35px;width:auto;padding-left:30px}.edit-label.modal .form .minicolors-swatch.minicolors-sprite,.new-label.segment .form .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.edit-label.modal .form .precolors,.new-label.segment .form .precolors{padding-left:0;padding-right:0;margin:3px 10px auto 10px;width:120px}.edit-label.modal .form .precolors .color,.new-label.segment .form .precolors .color{float:left;width:15px;height:15px}#avatar-arrow:after,#avatar-arrow:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}#avatar-arrow:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}#avatar-arrow:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}#delete-repo-modal .ui.message,#transfer-repo-modal .ui.message{width:100%!important}.tab-size-1{tab-size:1!important;-moz-tab-size:1!important}.tab-size-2{tab-size:2!important;-moz-tab-size:2!important}.tab-size-3{tab-size:3!important;-moz-tab-size:3!important}.tab-size-4{tab-size:4!important;-moz-tab-size:4!important}.tab-size-5{tab-size:5!important;-moz-tab-size:5!important}.tab-size-6{tab-size:6!important;-moz-tab-size:6!important}.tab-size-7{tab-size:7!important;-moz-tab-size:7!important}.tab-size-8{tab-size:8!important;-moz-tab-size:8!important}.tab-size-9{tab-size:9!important;-moz-tab-size:9!important}.tab-size-10{tab-size:10!important;-moz-tab-size:10!important}.tab-size-11{tab-size:11!important;-moz-tab-size:11!important}.tab-size-12{tab-size:12!important;-moz-tab-size:12!important}.tab-size-13{tab-size:13!important;-moz-tab-size:13!important}.tab-size-14{tab-size:14!important;-moz-tab-size:14!important}.tab-size-15{tab-size:15!important;-moz-tab-size:15!important}.tab-size-16{tab-size:16!important;-moz-tab-size:16!important}.stats-table{display:table;width:100%}.stats-table .table-cell{display:table-cell}.stats-table .table-cell.tiny{height:.5em}tbody.commit-list{vertical-align:baseline}.commit-body{white-space:pre-wrap}@media only screen and (max-width:767px){.ui.stackable.menu.mobile--margin-between-items>.item{margin-top:5px;margin-bottom:5px}.ui.stackable.menu.mobile--no-negative-margins{margin-left:0;margin-right:0}}#topic_edit{margin-top:5px;display:none}#repo-topic{margin-top:5px}.CodeMirror{font:14px Consolas,"Liberation Mono",Menlo,Courier,monospace}.CodeMirror.cm-s-default{border-radius:3px;padding:0!important}.CodeMirror .cm-comment{background:inherit!important}.repository.file.editor .tab[data-tab=write]{padding:0!important}.repository.file.editor .tab[data-tab=write] .editor-toolbar{border:none!important}.repository.file.editor .tab[data-tab=write] .CodeMirror{border-left:none;border-right:none;border-bottom:none}.organization{padding-top:15px;padding-bottom:80px}.organization .head .ui.header .text{vertical-align:middle;font-size:1.6rem;margin-left:15px}.organization .head .ui.header .ui.right{margin-top:5px}.organization.new.org form{margin:auto}.organization.new.org form .ui.message{text-align:center}@media only screen and (min-width:768px){.organization.new.org form{width:800px!important}.organization.new.org form .header{padding-left:280px!important}.organization.new.org form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.organization.new.org form .help{margin-left:265px!important}.organization.new.org form .optional .title{margin-left:250px!important}.organization.new.org form input,.organization.new.org form textarea{width:50%!important}}@media only screen and (max-width:767px){.organization.new.org form .optional .title{margin-left:15px}.organization.new.org form .inline.field>label{display:block}}.organization.new.org form .header{padding-left:0!important;text-align:center}.organization.options input{min-width:300px}.organization.profile #org-avatar{width:100px;height:100px;margin-right:15px}.organization.profile #org-info .ui.header{font-size:36px;margin-bottom:0}.organization.profile #org-info .desc{font-size:16px;margin-bottom:10px}.organization.profile #org-info .meta .item{display:inline-block;margin-right:10px}.organization.profile #org-info .meta .item .icon{margin-right:5px}.organization.profile .ui.top.header .ui.right{margin-top:0}.organization.profile .teams .item{padding:10px 15px}.organization.profile .members .ui.avatar,.organization.teams .members .ui.avatar{width:48px;height:48px;margin-right:5px}.organization.invite #invite-box{margin:auto;margin-top:50px;width:500px!important}.organization.invite #invite-box #search-user-box input{margin-left:0;width:300px}.organization.invite #invite-box .ui.button{margin-left:5px;margin-top:-3px}.organization.members .list .item{margin-left:0;margin-right:0;border-bottom:1px solid #eee}.organization.members .list .item .ui.avatar{width:48px;height:48px}.organization.members .list .item .meta{line-height:24px}.organization.teams .detail .item{padding:10px 15px}.organization.teams .detail .item:not(:last-child){border-bottom:1px solid #eee}.organization.teams .members .item,.organization.teams .repositories .item{padding:10px 20px;line-height:32px}.organization.teams .members .item:not(:last-child),.organization.teams .repositories .item:not(:last-child){border-bottom:1px solid #DDD}.organization.teams .members .item .button,.organization.teams .repositories .item .button{padding:9px 10px}.organization.teams #add-member-form input,.organization.teams #add-repo-form input{margin-left:0}.organization.teams #add-member-form .ui.button,.organization.teams #add-repo-form .ui.button{margin-left:5px;margin-top:-3px}.user:not(.icon){padding-top:15px;padding-bottom:80px}.user.profile .ui.card .username{display:block}.user.profile .ui.card .extra.content{padding:0}.user.profile .ui.card .extra.content ul{margin:0;padding:0}.user.profile .ui.card .extra.content ul li{padding:10px;list-style:none}.user.profile .ui.card .extra.content ul li:not(:last-child){border-bottom:1px solid #eaeaea}.user.profile .ui.card .extra.content ul li .octicon{margin-left:1px;margin-right:5px}.user.profile .ui.card .extra.content ul li.follow .ui.button{width:100%}.user.profile .ui.repository.list{margin-top:25px}.user.followers .header.name{font-size:20px;line-height:24px;vertical-align:middle}.user.followers .follow .ui.button{padding:8px 15px}.user.notification .octicon{float:left;font-size:2em}.user.notification .content{float:left;margin-left:7px}.user.notification table form{display:inline-block}.user.notification table button{padding:3px 3px 3px 5px}.user.notification table tr{cursor:pointer}.user.notification .octicon.green{color:#21ba45}.user.notification .octicon.red{color:#d01919}.user.notification .octicon.purple{color:#a333c8}.user.notification .octicon.blue{color:#2185d0}.user.link-account:not(.icon){padding-top:15px;padding-bottom:5px}.user.settings .iconFloat{float:left}.dashboard{padding-top:15px;padding-bottom:80px}.dashboard.feeds .context.user.menu,.dashboard.issues .context.user.menu{z-index:101;min-width:200px}.dashboard.feeds .context.user.menu .ui.header,.dashboard.issues .context.user.menu .ui.header{font-size:1rem;text-transform:none}.dashboard.feeds .filter.menu .item,.dashboard.issues .filter.menu .item{text-align:left}.dashboard.feeds .filter.menu .item .text,.dashboard.issues .filter.menu .item .text{height:16px;vertical-align:middle}.dashboard.feeds .filter.menu .item .text.truncate,.dashboard.issues .filter.menu .item .text.truncate{width:85%}.dashboard.feeds .filter.menu .item .floating.label,.dashboard.issues .filter.menu .item .floating.label{top:7px;left:90%;width:15%}.dashboard.feeds .filter.menu .jump.item,.dashboard.issues .filter.menu .jump.item{margin:1px;padding-right:0}.dashboard.feeds .filter.menu .menu,.dashboard.issues .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.dashboard.feeds .right.stackable.menu>.item.active,.dashboard.issues .right.stackable.menu>.item.active{color:#d9453d}.dashboard .dashboard-repos{margin:0 1px}.feeds .news>.ui.grid{margin-left:auto;margin-right:auto}.feeds .news .ui.avatar{margin-top:13px}.feeds .news p{line-height:1em}.feeds .news .time-since{font-size:13px}.feeds .news .issue.title{width:80%}.feeds .news .push.news .content ul{font-size:13px;list-style:none;padding-left:10px}.feeds .news .push.news .content ul img{margin-bottom:-2px}.feeds .news .push.news .content ul .text.truncate{width:80%;margin-bottom:-5px}.feeds .news .commit-id{font-family:Consolas,monospace}.feeds .news code{padding:1px;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px;word-break:break-all}.feeds .list .header .ui.label{margin-top:-4px;padding:4px 5px;font-weight:400}.feeds .list .header .plus.icon{margin-top:5px}.feeds .list ul{list-style:none;margin:0;padding-left:0}.feeds .list ul li:not(:last-child){border-bottom:1px solid #EAEAEA}.feeds .list ul li.private{background-color:#fcf8e9}.feeds .list ul li a{padding:6px 1.2em;display:block}.feeds .list ul li a .octicon{color:#888}.feeds .list ul li a .octicon.rear{font-size:15px}.feeds .list ul li a .star-num{font-size:12px}.feeds .list .repo-owner-name-list .item-name{max-width:70%;margin-bottom:-4px}.feeds .list #collaborative-repo-list .owner-and-repo{max-width:80%;margin-bottom:-5px}.feeds .list #collaborative-repo-list .owner-name{max-width:120px;margin-bottom:-5px}.admin{padding-top:15px;padding-bottom:80px}.admin .table.segment{padding:0;font-size:13px}.admin .table.segment:not(.striped){padding-top:5px}.admin .table.segment:not(.striped) thead th:last-child{padding-right:5px!important}.admin .table.segment th{padding-top:5px;padding-bottom:5px}.admin .table.segment:not(.select) td:first-of-type,.admin .table.segment:not(.select) th:first-of-type{padding-left:15px!important}.admin .ui.header,.admin .ui.segment{box-shadow:0 1px 2px 0 rgba(34,36,38,.15)}.admin.user .email{max-width:200px}.admin dl.admin-dl-horizontal{padding:20px;margin:0}.admin dl.admin-dl-horizontal dd{margin-left:275px}.admin dl.admin-dl-horizontal dt{font-weight:bolder;float:left;width:285px;clear:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.admin.config #test-mail-btn{margin-left:5px}.explore{padding-top:15px;padding-bottom:80px}.explore .navbar{justify-content:center;padding-top:15px!important;margin-top:-15px!important;margin-bottom:15px!important;background-color:#FAFAFA!important;border-width:1px!important}.explore .navbar .octicon{width:16px;text-align:center;margin-right:5px}.ui.repository.list .item{padding-bottom:25px}.ui.repository.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}.ui.repository.list .item .ui.header{font-size:1.5rem;padding-bottom:10px}.ui.repository.list .item .ui.header .name{word-break:break-all}.ui.repository.list .item .ui.header .metas{color:#888;font-size:14px;font-weight:400}.ui.repository.list .item .ui.header .metas span:not(:last-child){margin-right:5px}.ui.repository.list .item .time{font-size:12px;color:grey}.ui.repository.branches .time{font-size:12px;color:grey}.ui.user.list .item{padding-bottom:25px}.ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}.ui.user.list .item .ui.avatar.image{width:40px;height:40px}.ui.user.list .item .description{margin-top:5px}.ui.user.list .item .description .octicon:not(:first-child){margin-left:5px}.ui.user.list .item .description a{color:#333}.ui.user.list .item .description a:hover{text-decoration:underline} \ No newline at end of file +.tribute-container{box-shadow:0 1px 3px 1px #c7c7c7}.tribute-container ul{background:#fff}.tribute-container li{padding:8px 12px;border-bottom:1px solid #dcdcdc}.tribute-container li img{display:inline-block;vertical-align:middle;width:28px;height:28px;margin-right:5px}.tribute-container li span.fullname{font-weight:400;font-size:.8rem;margin-left:3px}.tribute-container li.highlight,.tribute-container li:hover{background:#2185D0;color:#fff}.emoji{width:1.5em;height:1.5em;display:inline-block;background-size:contain}body{font-family:Lato,"Segoe UI","Microsoft YaHei",Arial,Helvetica,sans-serif!important;background-color:#fff;overflow-y:scroll;-webkit-font-smoothing:antialiased}img{border-radius:3px}.rounded{border-radius:.28571429rem!important}code,pre{font:12px Consolas,"Liberation Mono",Menlo,Courier,monospace}code.raw,pre.raw{padding:7px 12px;margin:10px 0;background-color:#f8f8f8;border:1px solid #ddd;border-radius:3px;font-size:13px;line-height:1.5;overflow:auto}code.wrap,pre.wrap{white-space:pre-wrap;-ms-word-break:break-all;word-break:break-all;overflow-wrap:break-word;word-wrap:break-word}.dont-break-out{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.full.height{padding:0;margin:0 0 -80px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%;margin:0}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .column .menu{margin-top:0}.following.bar .top.menu a.item.brand{padding-left:0}.following.bar .brand .ui.mini.image{width:30px}.following.bar .top.menu .dropdown.item.active,.following.bar .top.menu .dropdown.item:hover,.following.bar .top.menu a.item:hover{background-color:transparent}.following.bar .top.menu a.item:hover{color:rgba(0,0,0,.45)}.following.bar .top.menu .menu{z-index:900}.following.bar .octicon{margin-right:.75em}.following.bar .octicon.fitted{margin-right:0}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .text .octicon{width:16px;text-align:center}@media only screen and (max-width:767px){.following.bar #navbar:not(.shown)>:not(:first-child){display:none}}.right.stackable.menu{margin-left:auto;display:flex;display:-ms-flexbox;-ms-flex-align:inherit;align-items:inherit;-ms-flex-direction:inherit;flex-direction:inherit}.ui.left{float:left}.ui.right{float:right}.ui.button,.ui.menu .item{-moz-user-select:auto;-ms-user-select:auto;-webkit-user-select:auto;user-select:auto}.ui.container.fluid.padded{padding:0 10px 0 10px}.ui.form .ui.button{font-weight:400}.ui.menu,.ui.segment,.ui.vertical.menu{box-shadow:none}.ui .menu:not(.vertical) .item>.button.compact{padding:.58928571em 1.125em}.ui .menu:not(.vertical) .item>.button.small{font-size:.92857143rem}.ui .text.red{color:#d95c5c!important}.ui .text.red a{color:#d95c5c!important}.ui .text.red a:hover{color:#E67777!important}.ui .text.blue{color:#428bca!important}.ui .text.blue a{color:#15c!important}.ui .text.blue a:hover{color:#428bca!important}.ui .text.black{color:#444}.ui .text.black:hover{color:#000}.ui .text.grey{color:#767676!important}.ui .text.grey a{color:#444!important}.ui .text.grey a:hover{color:#000!important}.ui .text.light.grey{color:#888!important}.ui .text.green{color:#6cc644!important}.ui .text.purple{color:#6e5494!important}.ui .text.yellow{color:#FBBD08!important}.ui .text.gold{color:#a1882b!important}.ui .text.left{text-align:left!important}.ui .text.right{text-align:right!important}.ui .text.small{font-size:.75em}.ui .text.normal{font-weight:400}.ui .text.bold{font-weight:700}.ui .text.italic{font-style:italic}.ui .text.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block}.ui .text.thin{font-weight:400}.ui .text.middle{vertical-align:middle}.ui .message{text-align:center}.ui .header>i+.content{padding-left:.75rem;vertical-align:middle}.ui .warning.header{background-color:#F9EDBE!important;border-color:#F0C36D}.ui .warning.segment{border-color:#F0C36D}.ui .info.segment{border:1px solid #c5d5dd}.ui .info.segment.top{background-color:#e6f1f6!important}.ui .info.segment.top h3,.ui .info.segment.top h4{margin-top:0}.ui .info.segment.top h3:last-child{margin-top:4px}.ui .info.segment.top>:last-child{margin-bottom:0}.ui .normal.header{font-weight:400}.ui .avatar.image{border-radius:3px}.ui .form .fake{display:none!important}.ui .form .sub.field{margin-left:25px}.ui .sha.label{font-family:Consolas,Menlo,Monaco,"Lucida Console",monospace;font-size:13px;padding:6px 10px 4px 10px;font-weight:400;margin:0 6px}.ui.status.buttons .octicon{margin-right:4px}.ui.inline.delete-button{padding:8px 15px;font-weight:400}.ui .background.red{background-color:#d95c5c!important}.ui .background.blue{background-color:#428bca!important}.ui .background.black{background-color:#444}.ui .background.grey{background-color:#767676!important}.ui .background.light.grey{background-color:#888!important}.ui .background.green{background-color:#6cc644!important}.ui .background.purple{background-color:#6e5494!important}.ui .background.yellow{background-color:#FBBD08!important}.ui .background.gold{background-color:#a1882b!important}.ui .branch-tag-choice{line-height:20px}.overflow.menu .items{max-height:300px;overflow-y:auto}.overflow.menu .items .item{position:relative;cursor:pointer;display:block;border:none;height:auto;border-top:none;line-height:1em;color:rgba(0,0,0,.8);padding:.71428571em 1.14285714em!important;font-size:1rem;text-transform:none;font-weight:400;box-shadow:none;-webkit-touch-callout:none}.overflow.menu .items .item.active{font-weight:700}.overflow.menu .items .item:hover{background:rgba(0,0,0,.05);color:rgba(0,0,0,.8);z-index:13}.scrolling.menu .item.selected{font-weight:700!important}footer{margin-top:54px!important;height:40px;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .container{padding-top:10px}footer .container .fa{width:16px;text-align:center;color:#428bca}footer .container .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .container .links>:first-child{border-left:none}footer .ui.language .menu{max-height:500px;overflow-y:auto;margin-bottom:7px}.hide{display:none}.center{text-align:center}.img-1{width:2px!important;height:2px!important}.img-2{width:4px!important;height:4px!important}.img-3{width:6px!important;height:6px!important}.img-4{width:8px!important;height:8px!important}.img-5{width:10px!important;height:10px!important}.img-6{width:12px!important;height:12px!important}.img-7{width:14px!important;height:14px!important}.img-8{width:16px!important;height:16px!important}.img-9{width:18px!important;height:18px!important}.img-10{width:20px!important;height:20px!important}.img-11{width:22px!important;height:22px!important}.img-12{width:24px!important;height:24px!important}.img-13{width:26px!important;height:26px!important}.img-14{width:28px!important;height:28px!important}.img-15{width:30px!important;height:30px!important}.img-16{width:32px!important;height:32px!important}@media only screen and (min-width:768px){.mobile-only,.ui.button.mobile-only{display:none}.sr-mobile-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}}@media only screen and (max-width:767px){.not-mobile{display:none}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}@media only screen and (max-width:991px) and (min-width:768px){.ui.container{width:95%}}.hljs{background:inherit!important;padding:0!important}.ui.menu.new-menu{justify-content:center!important;padding-top:15px!important;margin-top:-15px!important;margin-bottom:15px!important;background-color:#FAFAFA!important;border-width:1px!important}@media only screen and (max-width:1200px){.ui.menu.new-menu{overflow-x:auto!important;justify-content:left!important;padding-bottom:5px}.ui.menu.new-menu::-webkit-scrollbar{height:8px;display:none}.ui.menu.new-menu:hover::-webkit-scrollbar{display:block}.ui.menu.new-menu::-webkit-scrollbar-track{background:rgba(0,0,0,.01)}.ui.menu.new-menu::-webkit-scrollbar-thumb{background:rgba(0,0,0,.2)}.ui.menu.new-menu:after{position:absolute;margin-top:-15px;display:block;background-image:linear-gradient(to right,rgba(255,255,255,0),#fff 100%);content:' ';right:0;height:53px;z-index:1000;width:60px;clear:none;visibility:visible}.ui.menu.new-menu a.item:last-child{padding-right:30px!important}}[v-cloak]{display:none!important}.repos-search{padding-bottom:0!important}.repos-filter{margin-top:0!important;border-bottom-width:0!important;margin-bottom:2px!important}.markdown:not(code){overflow:hidden;font-family:"Helvetica Neue",Helvetica,"Segoe UI",Arial,freesans,sans-serif;font-size:16px;line-height:1.6!important;word-wrap:break-word}.markdown:not(code).file-view{padding:2em 2em 2em!important}.markdown:not(code)>:first-child{margin-top:0!important}.markdown:not(code)>:last-child{margin-bottom:0!important}.markdown:not(code) a:not([href]){color:inherit;text-decoration:none}.markdown:not(code) .absent{color:#c00}.markdown:not(code) .anchor{position:absolute;top:0;left:0;display:block;padding-right:6px;padding-left:30px;margin-left:-30px}.markdown:not(code) .anchor:focus{outline:0}.markdown:not(code) h1,.markdown:not(code) h2,.markdown:not(code) h3,.markdown:not(code) h4,.markdown:not(code) h5,.markdown:not(code) h6{position:relative;margin-top:1em;margin-bottom:16px;font-weight:700;line-height:1.4}.markdown:not(code) h1:first-of-type,.markdown:not(code) h2:first-of-type,.markdown:not(code) h3:first-of-type,.markdown:not(code) h4:first-of-type,.markdown:not(code) h5:first-of-type,.markdown:not(code) h6:first-of-type{margin-top:0!important}.markdown:not(code) h1 .octicon-link,.markdown:not(code) h2 .octicon-link,.markdown:not(code) h3 .octicon-link,.markdown:not(code) h4 .octicon-link,.markdown:not(code) h5 .octicon-link,.markdown:not(code) h6 .octicon-link{display:none;color:#000;vertical-align:middle}.markdown:not(code) h1:hover .anchor,.markdown:not(code) h2:hover .anchor,.markdown:not(code) h3:hover .anchor,.markdown:not(code) h4:hover .anchor,.markdown:not(code) h5:hover .anchor,.markdown:not(code) h6:hover .anchor{padding-left:8px;margin-left:-30px;text-decoration:none}.markdown:not(code) h1:hover .anchor .octicon-link,.markdown:not(code) h2:hover .anchor .octicon-link,.markdown:not(code) h3:hover .anchor .octicon-link,.markdown:not(code) h4:hover .anchor .octicon-link,.markdown:not(code) h5:hover .anchor .octicon-link,.markdown:not(code) h6:hover .anchor .octicon-link{display:inline-block}.markdown:not(code) h1 code,.markdown:not(code) h1 tt,.markdown:not(code) h2 code,.markdown:not(code) h2 tt,.markdown:not(code) h3 code,.markdown:not(code) h3 tt,.markdown:not(code) h4 code,.markdown:not(code) h4 tt,.markdown:not(code) h5 code,.markdown:not(code) h5 tt,.markdown:not(code) h6 code,.markdown:not(code) h6 tt{font-size:inherit}.markdown:not(code) h1{padding-bottom:.3em;font-size:2.25em;line-height:1.2;border-bottom:1px solid #eee}.markdown:not(code) h1 .anchor{line-height:1}.markdown:not(code) h2{padding-bottom:.3em;font-size:1.75em;line-height:1.225;border-bottom:1px solid #eee}.markdown:not(code) h2 .anchor{line-height:1}.markdown:not(code) h3{font-size:1.5em;line-height:1.43}.markdown:not(code) h3 .anchor{line-height:1.2}.markdown:not(code) h4{font-size:1.25em}.markdown:not(code) h4 .anchor{line-height:1.2}.markdown:not(code) h5{font-size:1em}.markdown:not(code) h5 .anchor{line-height:1.1}.markdown:not(code) h6{font-size:1em;color:#777}.markdown:not(code) h6 .anchor{line-height:1.1}.markdown:not(code) blockquote,.markdown:not(code) dl,.markdown:not(code) ol,.markdown:not(code) p,.markdown:not(code) pre,.markdown:not(code) table,.markdown:not(code) ul{margin-top:0;margin-bottom:16px}.markdown:not(code) blockquote{margin-left:0}.markdown:not(code) hr{height:4px;padding:0;margin:16px 0;background-color:#e7e7e7;border:0 none}.markdown:not(code) ol,.markdown:not(code) ul{padding-left:2em}.markdown:not(code) ol.no-list,.markdown:not(code) ul.no-list{padding:0;list-style-type:none}.markdown:not(code) ol ol,.markdown:not(code) ol ul,.markdown:not(code) ul ol,.markdown:not(code) ul ul{margin-top:0;margin-bottom:0}.markdown:not(code) ol ol,.markdown:not(code) ul ol{list-style-type:lower-roman}.markdown:not(code) li>p{margin-top:0}.markdown:not(code) dl{padding:0}.markdown:not(code) dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:700}.markdown:not(code) dl dd{padding:0 16px;margin-bottom:16px}.markdown:not(code) blockquote{padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown:not(code) blockquote>:first-child{margin-top:0}.markdown:not(code) blockquote>:last-child{margin-bottom:0}.markdown:not(code) table{width:auto;overflow:auto;word-break:normal;word-break:keep-all}.markdown:not(code) table th{font-weight:700}.markdown:not(code) table td,.markdown:not(code) table th{padding:6px 13px!important;border:1px solid #ddd!important}.markdown:not(code) table tr{background-color:#fff;border-top:1px solid #ccc}.markdown:not(code) table tr:nth-child(2n){background-color:#f8f8f8}.markdown:not(code) img{max-width:100%;box-sizing:border-box}.markdown:not(code) .emoji{max-width:none}.markdown:not(code) span.frame{display:block;overflow:hidden}.markdown:not(code) span.frame>span{display:block;float:left;width:auto;padding:7px;margin:13px 0 0;overflow:hidden;border:1px solid #ddd}.markdown:not(code) span.frame span img{display:block;float:left}.markdown:not(code) span.frame span span{display:block;padding:5px 0 0;clear:both;color:#333}.markdown:not(code) span.align-center{display:block;overflow:hidden;clear:both}.markdown:not(code) span.align-center>span{display:block;margin:13px auto 0;overflow:hidden;text-align:center}.markdown:not(code) span.align-center span img{margin:0 auto;text-align:center}.markdown:not(code) span.align-right{display:block;overflow:hidden;clear:both}.markdown:not(code) span.align-right>span{display:block;margin:13px 0 0;overflow:hidden;text-align:right}.markdown:not(code) span.align-right span img{margin:0;text-align:right}.markdown:not(code) span.float-left{display:block;float:left;margin-right:13px;overflow:hidden}.markdown:not(code) span.float-left span{margin:13px 0 0}.markdown:not(code) span.float-right{display:block;float:right;margin-left:13px;overflow:hidden}.markdown:not(code) span.float-right>span{display:block;margin:13px auto 0;overflow:hidden;text-align:right}.markdown:not(code) code,.markdown:not(code) tt{padding:0;padding-top:.2em;padding-bottom:.2em;margin:0;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px}.markdown:not(code) code:after,.markdown:not(code) code:before,.markdown:not(code) tt:after,.markdown:not(code) tt:before{letter-spacing:-.2em;content:"\00a0"}.markdown:not(code) code br,.markdown:not(code) tt br{display:none}.markdown:not(code) del code{text-decoration:inherit}.markdown:not(code) pre>code{padding:0;margin:0;font-size:100%;word-break:normal;white-space:pre;background:0 0;border:0}.markdown:not(code) .highlight{margin-bottom:16px}.markdown:not(code) .highlight pre,.markdown:not(code) pre{padding:16px;overflow:auto;font-size:85%;line-height:1.45;background-color:#f7f7f7;border-radius:3px}.markdown:not(code) .highlight pre{margin-bottom:0;word-break:normal}.markdown:not(code) pre{word-wrap:normal}.markdown:not(code) pre code,.markdown:not(code) pre tt{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background-color:transparent;border:0}.markdown:not(code) pre code:after,.markdown:not(code) pre code:before,.markdown:not(code) pre tt:after,.markdown:not(code) pre tt:before{content:normal}.markdown:not(code) kbd{display:inline-block;padding:3px 5px;font-size:11px;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:solid 1px #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.markdown:not(code) input[type=checkbox]{vertical-align:middle!important}.markdown:not(code) .csv-data td,.markdown:not(code) .csv-data th{padding:5px;overflow:hidden;font-size:12px;line-height:1;text-align:left;white-space:nowrap}.markdown:not(code) .csv-data .blob-num{padding:10px 8px 9px;text-align:right;background:#fff;border:0}.markdown:not(code) .csv-data tr{border-top:0}.markdown:not(code) .csv-data th{font-weight:700;background:#f8f8f8;border-top:0}.markdown:not(code) .ui.list .list,.markdown:not(code) ol.ui.list ol,.markdown:not(code) ul.ui.list ul{padding-left:2em}.home{padding-bottom:80px}.home .logo{max-width:220px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif,'Microsoft YaHei'}@media only screen and (max-width:767px){.home .hero h1{font-size:3.5em}.home .hero h2{font-size:2em}}@media only screen and (min-width:768px){.home .hero h1{font-size:5.5em}.home .hero h2{font-size:3em}}.home .hero .octicon{color:#5aa509;font-size:40px;width:50px}.home .hero.header{font-size:20px}.home p.large{font-size:16px}.home .stackable{padding-top:30px}.home a{color:#5aa509}.signup{padding-top:15px;padding-bottom:80px}.install{padding-top:45px;padding-bottom:80px}.install form label{text-align:right;width:320px!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:335px!important}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.ui.attached.header .right .button{padding:8px 10px;font-weight:400}#create-page-form form{margin:auto}#create-page-form form .ui.message{text-align:center}@media only screen and (min-width:768px){#create-page-form form{width:800px!important}#create-page-form form .header{padding-left:280px!important}#create-page-form form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}#create-page-form form .help{margin-left:265px!important}#create-page-form form .optional .title{margin-left:250px!important}#create-page-form form input,#create-page-form form textarea{width:50%!important}}@media only screen and (max-width:767px){#create-page-form form .optional .title{margin-left:15px}#create-page-form form .inline.field>label{display:block}}.signin .oauth2 div{display:inline-block}.signin .oauth2 div p{margin:10px 5px 0 0;float:left}.signin .oauth2 a{margin-right:3px}.signin .oauth2 a:last-child{margin-right:0}.signin .oauth2 img{width:32px;height:32px}.signin .oauth2 img.openidConnect{width:auto}.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{margin:auto}.user.activate form .ui.message,.user.forgot.password form .ui.message,.user.reset.password form .ui.message,.user.signin form .ui.message,.user.signup form .ui.message{text-align:center}@media only screen and (min-width:768px){.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{width:800px!important}.user.activate form .header,.user.forgot.password form .header,.user.reset.password form .header,.user.signin form .header,.user.signup form .header{padding-left:280px!important}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.user.activate form .help,.user.forgot.password form .help,.user.reset.password form .help,.user.signin form .help,.user.signup form .help{margin-left:265px!important}.user.activate form .optional .title,.user.forgot.password form .optional .title,.user.reset.password form .optional .title,.user.signin form .optional .title,.user.signup form .optional .title{margin-left:250px!important}.user.activate form input,.user.activate form textarea,.user.forgot.password form input,.user.forgot.password form textarea,.user.reset.password form input,.user.reset.password form textarea,.user.signin form input,.user.signin form textarea,.user.signup form input,.user.signup form textarea{width:50%!important}}@media only screen and (max-width:767px){.user.activate form .optional .title,.user.forgot.password form .optional .title,.user.reset.password form .optional .title,.user.signin form .optional .title,.user.signup form .optional .title{margin-left:15px}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{display:block}}.user.activate form,.user.forgot.password form,.user.reset.password form,.user.signin form,.user.signup form{width:700px!important}.user.activate form .header,.user.forgot.password form .header,.user.reset.password form .header,.user.signin form .header,.user.signup form .header{padding-left:0!important;text-align:center}.user.activate form .inline.field>label,.user.forgot.password form .inline.field>label,.user.reset.password form .inline.field>label,.user.signin form .inline.field>label,.user.signup form .inline.field>label{width:200px!important}.repository.new.fork form,.repository.new.migrate form,.repository.new.repo form{margin:auto}.repository.new.fork form .ui.message,.repository.new.migrate form .ui.message,.repository.new.repo form .ui.message{text-align:center}@media only screen and (min-width:768px){.repository.new.fork form,.repository.new.migrate form,.repository.new.repo form{width:800px!important}.repository.new.fork form .header,.repository.new.migrate form .header,.repository.new.repo form .header{padding-left:280px!important}.repository.new.fork form .inline.field>label,.repository.new.migrate form .inline.field>label,.repository.new.repo form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help,.repository.new.migrate form .help,.repository.new.repo form .help{margin-left:265px!important}.repository.new.fork form .optional .title,.repository.new.migrate form .optional .title,.repository.new.repo form .optional .title{margin-left:250px!important}.repository.new.fork form input,.repository.new.fork form textarea,.repository.new.migrate form input,.repository.new.migrate form textarea,.repository.new.repo form input,.repository.new.repo form textarea{width:50%!important}}@media only screen and (max-width:767px){.repository.new.fork form .optional .title,.repository.new.migrate form .optional .title,.repository.new.repo form .optional .title{margin-left:15px}.repository.new.fork form .inline.field>label,.repository.new.migrate form .inline.field>label,.repository.new.repo form .inline.field>label{display:block}}.repository.new.fork form .dropdown .dropdown.icon,.repository.new.migrate form .dropdown .dropdown.icon,.repository.new.repo form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text,.repository.new.migrate form .dropdown .text,.repository.new.repo form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i,.repository.new.migrate form .dropdown .text i,.repository.new.repo form .dropdown .text i{margin-right:0!important}.repository.new.fork form .header,.repository.new.migrate form .header,.repository.new.repo form .header{padding-left:0!important;text-align:center}.repository.new.repo .ui.form .selection.dropdown:not(.owner){width:50%!important}@media only screen and (min-width:768px){.repository.new.repo .ui.form #auto-init{margin-left:265px!important}}.new.webhook form .help{margin-left:25px}.new.webhook .events.fields .column{padding-left:40px}.githook textarea{font-family:monospace}.repository{padding-top:15px;padding-bottom:80px}.repository .header-grid{padding-top:5px;padding-bottom:5px}.repository .header-grid .ui.compact.menu{margin-left:1rem}.repository .header-grid .ui.header{margin-top:0}.repository .header-grid .mega-octicon{width:30px;font-size:30px}.repository .header-grid .ui.huge.breadcrumb{font-weight:400;font-size:1.7rem}.repository .header-grid .fork-flag{margin-left:38px;margin-top:3px;display:block;font-size:12px;white-space:nowrap}.repository .header-grid .octicon.octicon-repo-forked{margin-top:-1px;font-size:15px}.repository .header-grid .button{margin-top:2px;margin-bottom:2px}.repository .tabs .navbar{justify-content:initial}.repository .navbar{display:flex;justify-content:space-between}.repository .navbar .ui.label{margin-top:-2px;margin-left:7px;padding:3px 5px}.repository .owner.dropdown{min-width:40%!important}.repository #file-buttons{margin-left:auto!important;font-weight:400}.repository #file-buttons .ui.button{padding:8px 10px;font-weight:400}.repository .metas .menu{max-height:300px;overflow-x:auto}.repository .metas .ui.list .hide{display:none!important}.repository .metas .ui.list .item{padding:0}.repository .metas .ui.list .label.color{padding:0 8px;margin-right:5px}.repository .metas .ui.list a{margin:2px 0}.repository .metas .ui.list a .text{color:#444}.repository .metas .ui.list a .text:hover{color:#000}.repository .header-wrapper{background-color:#FAFAFA;margin-top:-15px;padding-top:15px}.repository .header-wrapper .ui.tabs.divider{border-bottom:none}.repository .header-wrapper .ui.tabular .octicon{margin-right:5px}.repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin:5px -7px 0 -5px;width:16px}.repository .filter.menu .text{margin-left:.9em}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .dropdown.item{margin:1px;padding-right:0}.repository .select-label .item{max-width:250px;overflow:hidden;text-overflow:ellipsis}.repository .select-label .desc{padding-left:16px}.repository .ui.tabs.container{margin-top:14px;margin-bottom:0}.repository .ui.tabs.container .ui.menu{border-bottom:none}.repository .ui.tabs.divider{margin-top:0;margin-bottom:20px}.repository #clone-panel{width:350px}.repository #clone-panel input{border-radius:0;padding:5px 10px}.repository #clone-panel .clone.button{font-size:13px;padding:0 5px}.repository #clone-panel .clone.button:first-child{border-radius:.28571429rem 0 0 .28571429rem}.repository #clone-panel .icon.button{padding:0 10px}.repository #clone-panel .dropdown .menu{right:0!important;left:auto!important}.repository.file.list .repo-description{display:flex;justify-content:space-between;align-items:center}.repository.file.list #repo-desc{font-size:1.2em}.repository.file.list .choose.reference .header .icon{font-size:1.4em}.repository.file.list .repo-path .divider,.repository.file.list .repo-path .section{display:inline}.repository.file.list #file-buttons{font-weight:400}.repository.file.list #file-buttons .ui.button{padding:8px 10px;font-weight:400}.repository.file.list #repo-files-table thead th{padding-top:8px;padding-bottom:5px;font-weight:400}.repository.file.list #repo-files-table thead th:first-child{display:block;position:relative;width:325%}.repository.file.list #repo-files-table thead .ui.avatar{margin-bottom:5px}.repository.file.list #repo-files-table tbody .octicon{margin-left:3px;margin-right:5px;color:#777}.repository.file.list #repo-files-table tbody .octicon.octicon-mail-reply{margin-right:10px}.repository.file.list #repo-files-table tbody .octicon.octicon-file-directory,.repository.file.list #repo-files-table tbody .octicon.octicon-file-submodule{color:#1e70bf}.repository.file.list #repo-files-table td{padding-top:8px;padding-bottom:8px}.repository.file.list #repo-files-table td.message .isSigned{cursor:default}.repository.file.list #repo-files-table tr:hover{background-color:#ffE}.repository.file.list #repo-files-table .jumpable-path{color:#888}.repository.file.list .non-diff-file-content .header .icon{font-size:1em}.repository.file.list .non-diff-file-content .header .file-actions{margin-top:0;margin-bottom:-5px;padding-left:20px}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon{display:inline-block;padding:5px;margin-left:5px;line-height:1;color:#767676;vertical-align:middle;background:0 0;border:0;outline:0}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon:hover{color:#4078c0}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon-danger:hover{color:#bd2c00}.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon.disabled{color:#bbb;cursor:default}.repository.file.list .non-diff-file-content .header .file-actions #delete-file-form{display:inline-block}.repository.file.list .non-diff-file-content .view-raw{padding:5px}.repository.file.list .non-diff-file-content .view-raw *{max-width:100%}.repository.file.list .non-diff-file-content .view-raw img{padding:5px 5px 0 5px}.repository.file.list .non-diff-file-content .plain-text{padding:1em 2em 1em 2em}.repository.file.list .non-diff-file-content .code-view *{font-size:12px;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:20px}.repository.file.list .non-diff-file-content .code-view table{width:100%}.repository.file.list .non-diff-file-content .code-view .lines-num{vertical-align:top;text-align:right;color:#999;background:#f5f5f5;width:1%;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}.repository.file.list .non-diff-file-content .code-view .lines-num span{line-height:20px;padding:0 10px;cursor:pointer;display:block}.repository.file.list .non-diff-file-content .code-view .lines-code,.repository.file.list .non-diff-file-content .code-view .lines-num{padding:0}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs,.repository.file.list .non-diff-file-content .code-view .lines-code ol,.repository.file.list .non-diff-file-content .code-view .lines-code pre,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs,.repository.file.list .non-diff-file-content .code-view .lines-num ol,.repository.file.list .non-diff-file-content .code-view .lines-num pre{background-color:#fff;margin:0;padding:0!important}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li,.repository.file.list .non-diff-file-content .code-view .lines-code ol li,.repository.file.list .non-diff-file-content .code-view .lines-code pre li,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li,.repository.file.list .non-diff-file-content .code-view .lines-num ol li,.repository.file.list .non-diff-file-content .code-view .lines-num pre li{display:block;width:100%}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li.active,.repository.file.list .non-diff-file-content .code-view .lines-code ol li.active,.repository.file.list .non-diff-file-content .code-view .lines-code pre li.active,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li.active,.repository.file.list .non-diff-file-content .code-view .lines-num ol li.active,.repository.file.list .non-diff-file-content .code-view .lines-num pre li.active{background:#ffd}.repository.file.list .non-diff-file-content .code-view .lines-code .hljs li:before,.repository.file.list .non-diff-file-content .code-view .lines-code ol li:before,.repository.file.list .non-diff-file-content .code-view .lines-code pre li:before,.repository.file.list .non-diff-file-content .code-view .lines-num .hljs li:before,.repository.file.list .non-diff-file-content .code-view .lines-num ol li:before,.repository.file.list .non-diff-file-content .code-view .lines-num pre li:before{content:' '}.repository.file.list .non-diff-file-content .code-view .active{background:#ffd}.repository.file.list .sidebar{padding-left:0}.repository.file.list .sidebar .octicon{width:16px}.repository.file.editor .treepath{width:100%}.repository.file.editor .treepath input{vertical-align:middle;box-shadow:rgba(0,0,0,.0745098) 0 1px 2px inset;width:inherit;padding:7px 8px;margin-right:5px}.repository.file.editor .tabular.menu .octicon{margin-right:5px}.repository.file.editor .commit-form-wrapper{padding-left:64px}.repository.file.editor .commit-form-wrapper .commit-avatar{float:left;margin-left:-64px;width:3em;height:auto}.repository.file.editor .commit-form-wrapper .commit-form{position:relative;padding:15px;margin-bottom:10px;border:1px solid #ddd;border-radius:3px}.repository.file.editor .commit-form-wrapper .commit-form:after,.repository.file.editor .commit-form-wrapper .commit-form:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.file.editor .commit-form-wrapper .commit-form:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.file.editor .commit-form-wrapper .commit-form:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.file.editor .commit-form-wrapper .commit-form:after{border-right-color:#fff}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .branch-name{display:inline-block;padding:3px 6px;font:12px Consolas,"Liberation Mono",Menlo,Courier,monospace;color:rgba(0,0,0,.65);background-color:rgba(209,227,237,.45);border-radius:3px}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input{position:relative;margin-left:25px}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input input{width:240px!important;padding-left:26px!important}.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .octicon-git-branch{position:absolute;top:9px;left:10px;color:#b0c4ce}.repository.options #interval{width:100px!important;min-width:100px}.repository.options .danger .item{padding:20px 15px}.repository.options .danger .ui.divider{margin:0}.repository.new.issue .comment.form .comment .avatar{width:3em}.repository.new.issue .comment.form .content{margin-left:4em}.repository.new.issue .comment.form .content:after,.repository.new.issue .comment.form .content:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.new.issue .comment.form .content:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.new.issue .comment.form .content:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.new.issue .comment.form .content:after{border-right-color:#fff}.repository.new.issue .comment.form .content .markdown{font-size:14px}.repository.new.issue .comment.form .metas{min-width:220px}.repository.new.issue .comment.form .metas .filter.menu{max-height:300px;overflow-x:auto}.repository.view.issue .title{padding-bottom:0!important}.repository.view.issue .title h1{font-weight:300;font-size:2.3rem;margin-bottom:5px}.repository.view.issue .title h1 .ui.input{font-size:.5em;vertical-align:top;width:50%;min-width:600px}.repository.view.issue .title h1 .ui.input input{font-size:1.5em;padding:6px 10px}.repository.view.issue .title .index{font-weight:300;color:#aaa;letter-spacing:-1px}.repository.view.issue .title .label{margin-right:10px}.repository.view.issue .title .edit-zone{margin-top:10px}.repository.view.issue .pull-desc code{color:#0166E6}.repository.view.issue .pull.tabular.menu{margin-bottom:10px}.repository.view.issue .pull.tabular.menu .octicon{margin-right:5px}.repository.view.issue .pull.tab.segment{border:none;padding:0;padding-top:10px;box-shadow:none;background-color:inherit}.repository.view.issue .pull .merge.box .avatar{margin-left:10px;margin-top:10px}.repository.view.issue .comment-list:before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:96px;width:2px;background-color:#f3f3f3;z-index:-1}.repository.view.issue .comment-list .comment .avatar{width:3em}.repository.view.issue .comment-list .comment .tag{color:#767676;margin-top:3px;padding:2px 5px;font-size:12px;border:1px solid rgba(0,0,0,.1);border-radius:3px}.repository.view.issue .comment-list .comment .actions .item{float:left}.repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px}.repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px}.repository.view.issue .comment-list .comment .content{margin-left:4em}.repository.view.issue .comment-list .comment .content>.header{font-weight:400;padding:auto 15px;position:relative;color:#767676;background-color:#f7f7f7;border-bottom:1px solid #eee;border-top-left-radius:3px;border-top-right-radius:3px}.repository.view.issue .comment-list .comment .content>.header:after,.repository.view.issue .comment-list .comment .content>.header:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.view.issue .comment-list .comment .content>.header:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.view.issue .comment-list .comment .content>.header:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.view.issue .comment-list .comment .content>.header .text{max-width:78%;padding-top:10px;padding-bottom:10px}.repository.view.issue .comment-list .comment .content .markdown{font-size:14px}.repository.view.issue .comment-list .comment .content .no-content{color:#767676;font-style:italic}.repository.view.issue .comment-list .comment .content>.bottom.segment{background:#f3f4f5}.repository.view.issue .comment-list .comment .content>.bottom.segment .ui.images::after{clear:both;content:' ';display:block}.repository.view.issue .comment-list .comment .content>.bottom.segment a{display:block;float:left;margin:5px;padding:5px;height:150px;border:solid 1px #eee;border-radius:3px;max-width:150px;background-color:#fff}.repository.view.issue .comment-list .comment .content>.bottom.segment a:before{content:' ';display:inline-block;height:100%;vertical-align:middle}.repository.view.issue .comment-list .comment .content>.bottom.segment .ui.image{max-height:100%;width:auto;margin:0;vertical-align:middle}.repository.view.issue .comment-list .comment .content>.bottom.segment span.ui.image{font-size:128px;color:#000}.repository.view.issue .comment-list .comment .content>.bottom.segment span.ui.image:hover{color:#000}.repository.view.issue .comment-list .comment .ui.form .field:first-child{clear:none}.repository.view.issue .comment-list .comment .ui.form .tab.segment{border:none;padding:0;padding-top:10px}.repository.view.issue .comment-list .comment .ui.form textarea{height:200px;font-family:Consolas,monospace}.repository.view.issue .comment-list .comment .edit.buttons{margin-top:10px}.repository.view.issue .comment-list .event{position:relative;margin:15px 0 15px 79px;padding-left:25px}.repository.view.issue .comment-list .event .octicon{width:30px;float:left;text-align:center}.repository.view.issue .comment-list .event .octicon.octicon-circle-slash{margin-top:5px;margin-left:-34.5px;font-size:20px;color:#bd2c00}.repository.view.issue .comment-list .event .octicon.octicon-primitive-dot{margin-left:-28.5px;margin-right:-1px;font-size:30px;color:#6cc644}.repository.view.issue .comment-list .event .octicon.octicon-bookmark{margin-top:3px;margin-left:-31px;margin-right:-1px;font-size:25px}.repository.view.issue .comment-list .event .detail{font-size:.9rem;margin-top:5px;margin-left:35px}.repository.view.issue .comment-list .event .detail .octicon.octicon-git-commit{margin-top:2px}.repository.view.issue .ui.segment.metas{margin-top:-3px}.repository.view.issue .ui.participants img{margin-top:5px;margin-right:5px}.repository .comment.form .ui.comments{margin-top:-12px;max-width:100%}.repository .comment.form .content .field:first-child{clear:none}.repository .comment.form .content .form:after,.repository .comment.form .content .form:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository .comment.form .content .form:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository .comment.form .content .form:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository .comment.form .content .form:after{border-right-color:#fff}.repository .comment.form .content .tab.segment{border:none;padding:0;padding-top:10px}.repository .comment.form .content textarea{height:200px;font-family:Consolas,monospace}.repository .label.list{list-style:none;padding-top:15px}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .label.list .item .ui.label{font-size:1em}.repository .milestone.list{list-style:none;padding-top:15px}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.new.milestone #deadline{width:150px}.repository.compare.pull .choose.branch .octicon{padding-right:10px}.repository.compare.pull .comment.form .content:after,.repository.compare.pull .comment.form .content:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.repository.compare.pull .comment.form .content:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}.repository.compare.pull .comment.form .content:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}.repository.compare.pull .comment.form .content:after{border-right-color:#fff}.repository .filter.dropdown .menu{margin-top:1px!important}.repository.commits .header .search input{font-weight:400;padding:5px 10px}.repository #commits-table thead th:first-of-type{padding-left:15px}.repository #commits-table thead .sha{width:140px}.repository #commits-table thead .shatd{text-align:center}.repository #commits-table td.sha .sha.label{margin:0}.repository #commits-table.ui.basic.striped.table tbody tr:nth-child(2n){background-color:rgba(0,0,0,.02)!important}.repository #commits-table td.sha .sha.label.isSigned,.repository #repo-files-table .sha.label.isSigned{border:1px solid #BBB}.repository #commits-table td.sha .sha.label.isSigned .detail.icon,.repository #repo-files-table .sha.label.isSigned .detail.icon{background:#FAFAFA;margin:-6px -10px -4px 0;padding:5px 3px 5px 6px;border-left:1px solid #BBB;border-top-left-radius:0;border-bottom-left-radius:0}.repository #commits-table td.sha .sha.label.isSigned.isVerified,.repository #repo-files-table .sha.label.isSigned.isVerified{border:1px solid #21BA45;background:#21BA4518}.repository #commits-table td.sha .sha.label.isSigned.isVerified .detail.icon,.repository #repo-files-table .sha.label.isSigned.isVerified .detail.icon{border-left:1px solid #21BA4580}.repository .diff-detail-box{margin:15px 0;line-height:30px}.repository .diff-detail-box ol{clear:both;padding-left:0;margin-top:5px;margin-bottom:28px}.repository .diff-detail-box ol li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #DDD;padding-left:6px}.repository .diff-detail-box span.status{display:inline-block;width:12px;height:12px;margin-right:8px;vertical-align:middle}.repository .diff-detail-box span.status.modify{background-color:#f0db88}.repository .diff-detail-box span.status.add{background-color:#b4e2b4}.repository .diff-detail-box span.status.del{background-color:#e9aeae}.repository .diff-detail-box span.status.rename{background-color:#dad8ff}.repository .diff-detail-box .ui.right{margin-bottom:15px}.repository .diff-box .header{display:flex;align-items:center}.repository .diff-box .header .count{margin-right:12px;font-size:13px;flex:0 0 auto}.repository .diff-box .header .count .bar{background-color:#bd2c00;height:12px;width:40px;display:inline-block;margin:2px 4px 0 4px;vertical-align:text-top}.repository .diff-box .header .count .bar .add{background-color:#55a532;height:12px}.repository .diff-box .header .file{flex:1;color:#888;word-break:break-all}.repository .diff-box .header .button{margin:-5px 0 -5px 12px;padding:8px 10px;flex:0 0 auto}.repository .diff-file-box .header{background-color:#f7f7f7}.repository .diff-file-box .file-body.file-code .lines-num{text-align:right;color:#A7A7A7;background:#fafafa;width:1%;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;vertical-align:top}.repository .diff-file-box .file-body.file-code .lines-num span.fold{display:block;text-align:center}.repository .diff-file-box .file-body.file-code .lines-num-old{border-right:1px solid #DDD}.repository .diff-file-box .code-diff{font-size:12px}.repository .diff-file-box .code-diff td{padding:0;padding-left:10px;border-top:none}.repository .diff-file-box .code-diff pre{margin:0}.repository .diff-file-box .code-diff .lines-num{border-color:#d4d4d5;border-right-width:1px;border-right-style:solid;padding:0 5px}.repository .diff-file-box .code-diff tbody tr td.halfwidth{width:49%}.repository .diff-file-box .code-diff tbody tr td.tag-code,.repository .diff-file-box .code-diff tbody tr.tag-code td{background-color:#F0F0F0!important;border-color:#D2CECE!important;padding-top:8px;padding-bottom:8px}.repository .diff-file-box .code-diff tbody tr .removed-code{background-color:#f99}.repository .diff-file-box .code-diff tbody tr .added-code{background-color:#9f9}.repository .diff-file-box .code-diff-unified tbody tr.del-code td{background-color:#ffe0e0!important;border-color:#f1c0c0!important}.repository .diff-file-box .code-diff-unified tbody tr.add-code td{background-color:#d6fcd6!important;border-color:#c1e9c1!important}.repository .diff-file-box .code-diff-split table,.repository .diff-file-box .code-diff-split tbody{width:100%}.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(1),.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(2),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(3),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(4){background-color:#fafafa}.repository .diff-file-box .code-diff-split tbody tr td.del-code,.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(1),.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(2){background-color:#ffe0e0!important;border-color:#f1c0c0!important}.repository .diff-file-box .code-diff-split tbody tr td.add-code,.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(3),.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(4){background-color:#d6fcd6!important;border-color:#c1e9c1!important}.repository .diff-file-box .code-diff-split tbody tr td:nth-child(3){border-left-width:1px;border-left-style:solid}.repository .diff-file-box.file-content{clear:right}.repository .diff-file-box.file-content img{max-width:100%;padding:5px 5px 0 5px}.repository .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}.repository .repo-search-result{padding-top:10px;padding-bottom:10px}.repository .repo-search-result .lines-num a{color:inherit}.repository.quickstart .guide .item{padding:1em}.repository.quickstart .guide .item small{font-weight:400}.repository.quickstart .guide .clone.button:first-child{border-radius:.28571429rem 0 0 .28571429rem}.repository.quickstart .guide .ui.action.small.input{width:100%}.repository.quickstart .guide #repo-clone-url{border-radius:0;padding:5px 10px;font-size:1.2em}.repository.release #release-list{border-top:1px solid #DDD;margin-top:20px;padding-top:15px}.repository.release #release-list>li{list-style:none}.repository.release #release-list>li .detail,.repository.release #release-list>li .meta{padding-top:30px;padding-bottom:40px}.repository.release #release-list>li .meta{text-align:right;position:relative}.repository.release #release-list>li .meta .tag:not(.icon){display:block;margin-top:15px}.repository.release #release-list>li .meta .commit{display:block;margin-top:10px}.repository.release #release-list>li .detail{border-left:1px solid #DDD}.repository.release #release-list>li .detail .author img{margin-bottom:-3px}.repository.release #release-list>li .detail .download{margin-top:20px}.repository.release #release-list>li .detail .download>a .octicon{margin-left:5px;margin-right:5px}.repository.release #release-list>li .detail .download .list{padding-left:0;border-top:1px solid #eee}.repository.release #release-list>li .detail .download .list li{list-style:none;display:block;padding-top:8px;padding-bottom:8px;border-bottom:1px solid #eee}.repository.release #release-list>li .detail .dot{width:9px;height:9px;background-color:#ccc;z-index:999;position:absolute;display:block;left:-5px;top:40px;border-radius:6px;border:1px solid #FFF}.repository.new.release .target{min-width:500px}.repository.new.release .target #tag-name{margin-top:-4px}.repository.new.release .target .at{margin-left:-5px;margin-right:5px}.repository.new.release .target .dropdown.icon{margin:0;padding-top:3px}.repository.new.release .target .selection.dropdown{padding-top:10px;padding-bottom:10px}.repository.new.release .prerelease.field{margin-bottom:0}.repository.forks .list{margin-top:0}.repository.forks .list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px solid #DDD}.repository.forks .list .item .ui.avatar{float:left;margin-right:5px}.repository.forks .list .item .link{padding-top:5px}.repository.wiki.start .ui.segment{padding-top:70px;padding-bottom:100px}.repository.wiki.start .ui.segment .mega-octicon{font-size:48px}.repository.wiki.new .CodeMirror .CodeMirror-code{font-family:Consolas,monospace}.repository.wiki.new .CodeMirror .CodeMirror-code .cm-comment{background:inherit}.repository.wiki.new .editor-preview{background-color:#fff}.repository.wiki.view .choose.page{margin-top:-5px}.repository.wiki.view .ui.sub.header{text-transform:none}.repository.wiki.view>.markdown{padding:15px 30px}.repository.wiki.view>.markdown h1:first-of-type,.repository.wiki.view>.markdown h2:first-of-type,.repository.wiki.view>.markdown h3:first-of-type,.repository.wiki.view>.markdown h4:first-of-type,.repository.wiki.view>.markdown h5:first-of-type,.repository.wiki.view>.markdown h6:first-of-type{margin-top:0}@media only screen and (max-width:767px){.repository.wiki .dividing.header .stackable.grid .button{margin-top:2px;margin-bottom:2px}}.repository.settings.collaboration .collaborator.list{padding:0}.repository.settings.collaboration .collaborator.list>.item{margin:0;line-height:2em}.repository.settings.collaboration .collaborator.list>.item:not(:last-child){border-bottom:1px solid #DDD}.repository.settings.collaboration #repo-collab-form #search-user-box .results{left:7px}.repository.settings.collaboration #repo-collab-form .ui.button{margin-left:5px;margin-top:-3px}.repository.settings.branches .protected-branches .selection.dropdown{width:300px}.repository.settings.branches .protected-branches .item{border:1px solid #eaeaea;padding:10px 15px}.repository.settings.branches .protected-branches .item:not(:last-child){border-bottom:0}.repository.settings.branches .branch-protection .help{margin-left:26px;padding-top:0}.repository.settings.branches .branch-protection .fields{margin-left:20px;display:block}.repository.settings.branches .branch-protection .whitelist{margin-left:26px}.repository.settings.branches .branch-protection .whitelist .dropdown img{display:inline-block}.repository.settings.webhook .events .column{padding-bottom:0}.repository.settings.webhook .events .help{font-size:13px;margin-left:26px;padding-top:0}.repository .ui.attached.isSigned.isVerified:not(.positive){border-left:1px solid #A3C293;border-right:1px solid #A3C293}.repository .ui.attached.isSigned.isVerified.top:not(.positive){border-top:1px solid #A3C293}.repository .ui.attached.isSigned.isVerified:not(.positive):last-child{border-bottom:1px solid #A3C293}.repository .ui.segment.sub-menu{padding:7px;line-height:0}.repository .ui.segment.sub-menu .list{width:100%;display:flex}.repository .ui.segment.sub-menu .list .item{width:100%;border-radius:3px}.repository .ui.segment.sub-menu .list .item a{color:#000}.repository .ui.segment.sub-menu .list .item a:hover{color:#666}.repository .ui.segment.sub-menu .list .item.active{background:rgba(0,0,0,.05)}.repository .segment.reactions.dropdown .menu,.repository .select-reaction.dropdown .menu{right:0!important;left:auto!important}.repository .segment.reactions.dropdown .menu>.header,.repository .select-reaction.dropdown .menu>.header{margin:.75rem 0 .5rem}.repository .segment.reactions.dropdown .menu>.item,.repository .select-reaction.dropdown .menu>.item{float:left;padding:.5rem .5rem!important}.repository .segment.reactions.dropdown .menu>.item img.emoji,.repository .select-reaction.dropdown .menu>.item img.emoji{margin-right:0}.repository .segment.reactions{padding:.3em 1em}.repository .segment.reactions .ui.label{padding:.4em}.repository .segment.reactions .ui.label.disabled{cursor:default}.repository .segment.reactions .ui.label>img{height:1.5em!important}.repository .segment.reactions .select-reaction{float:none}.repository .segment.reactions .select-reaction:not(.active) a{display:none}.repository .segment.reactions:hover .select-reaction a{display:block}.user-cards .list{padding:0}.user-cards .list .item{list-style:none;width:32%;margin:10px 10px 10px 0;padding-bottom:14px;float:left}.user-cards .list .item .avatar{width:48px;height:48px;float:left;display:block;margin-right:10px}.user-cards .list .item .name{margin-top:0;margin-bottom:0;font-weight:400}.user-cards .list .item .meta{margin-top:5px}#search-repo-box .results .result .image,#search-user-box .results .result .image{float:left;margin-right:8px;width:2em;height:2em}#search-repo-box .results .result .content,#search-user-box .results .result .content{margin:6px 0}#issue-actions{display:none}.issue.list{list-style:none;padding-top:15px}.issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.issue.list>.item .title:hover{color:#000}.issue.list>.item .comment{padding-right:10px;color:#666}.issue.list>.item .desc{padding-top:5px;color:#999}.issue.list>.item .desc .checklist{padding-left:5px}.issue.list>.item .desc .checklist .progress-bar{margin-left:2px;width:80px;height:6px;display:inline-block;background-color:#eee;overflow:hidden;border-radius:3px;vertical-align:2px!important}.issue.list>.item .desc .checklist .progress-bar .progress{background-color:#ccc;display:block;height:100%}.issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.issue.list>.item .desc a.milestone:hover{color:#000!important}.issue.list>.item .desc .assignee{margin-top:-5px;margin-right:5px}.page.buttons{padding-top:15px}.ui.form .dropzone{width:100%;margin-bottom:10px;border:2px dashed #0087F7;box-shadow:none!important}.ui.form .dropzone .dz-error-message{top:140px}.settings .content{margin-top:2px}.settings .content .segment,.settings .content>.header{box-shadow:0 1px 2px 0 rgba(34,36,38,.15)}.settings .list>.item .green{color:#21BA45!important}.settings .list>.item:not(:first-child){border-top:1px solid #eaeaea;padding:1rem;margin:15px -1rem -1rem -1rem}.settings .list>.item>.mega-octicon{display:table-cell}.settings .list>.item>.mega-octicon+.content{display:table-cell;padding:0 0 0 .5em;vertical-align:top}.settings .list>.item .info{margin-top:10px}.settings .list>.item .info .tab.segment{border:none;padding:10px 0 0}.settings .list.key .meta{padding-top:5px;color:#666}.settings .list.email>.item:not(:first-child){min-height:60px}.settings .list.collaborator>.item{padding:0}.ui.vertical.menu .header.item{font-size:1.1em;background:#f0f0f0}.edit-label.modal .form .column,.new-label.segment .form .column{padding-right:0}.edit-label.modal .form .buttons,.new-label.segment .form .buttons{margin-left:auto;padding-top:15px}.edit-label.modal .form .color.picker.column,.new-label.segment .form .color.picker.column{width:auto}.edit-label.modal .form .color.picker.column .color-picker,.new-label.segment .form .color.picker.column .color-picker{height:35px;width:auto;padding-left:30px}.edit-label.modal .form .minicolors-swatch.minicolors-sprite,.new-label.segment .form .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.edit-label.modal .form .precolors,.new-label.segment .form .precolors{padding-left:0;padding-right:0;margin:3px 10px auto 10px;width:120px}.edit-label.modal .form .precolors .color,.new-label.segment .form .precolors .color{float:left;width:15px;height:15px}#avatar-arrow:after,#avatar-arrow:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}#avatar-arrow:before{border-right-color:#D4D4D5;border-width:9px;margin-top:-9px}#avatar-arrow:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}#delete-repo-modal .ui.message,#transfer-repo-modal .ui.message{width:100%!important}.tab-size-1{tab-size:1!important;-moz-tab-size:1!important}.tab-size-2{tab-size:2!important;-moz-tab-size:2!important}.tab-size-3{tab-size:3!important;-moz-tab-size:3!important}.tab-size-4{tab-size:4!important;-moz-tab-size:4!important}.tab-size-5{tab-size:5!important;-moz-tab-size:5!important}.tab-size-6{tab-size:6!important;-moz-tab-size:6!important}.tab-size-7{tab-size:7!important;-moz-tab-size:7!important}.tab-size-8{tab-size:8!important;-moz-tab-size:8!important}.tab-size-9{tab-size:9!important;-moz-tab-size:9!important}.tab-size-10{tab-size:10!important;-moz-tab-size:10!important}.tab-size-11{tab-size:11!important;-moz-tab-size:11!important}.tab-size-12{tab-size:12!important;-moz-tab-size:12!important}.tab-size-13{tab-size:13!important;-moz-tab-size:13!important}.tab-size-14{tab-size:14!important;-moz-tab-size:14!important}.tab-size-15{tab-size:15!important;-moz-tab-size:15!important}.tab-size-16{tab-size:16!important;-moz-tab-size:16!important}.stats-table{display:table;width:100%}.stats-table .table-cell{display:table-cell}.stats-table .table-cell.tiny{height:.5em}tbody.commit-list{vertical-align:baseline}.commit-body{white-space:pre-wrap}@media only screen and (max-width:767px){.ui.stackable.menu.mobile--margin-between-items>.item{margin-top:5px;margin-bottom:5px}.ui.stackable.menu.mobile--no-negative-margins{margin-left:0;margin-right:0}}#topic_edit{margin-top:5px;display:none}#repo-topic{margin-top:5px}.CodeMirror{font:14px Consolas,"Liberation Mono",Menlo,Courier,monospace}.CodeMirror.cm-s-default{border-radius:3px;padding:0!important}.CodeMirror .cm-comment{background:inherit!important}.repository.file.editor .tab[data-tab=write]{padding:0!important}.repository.file.editor .tab[data-tab=write] .editor-toolbar{border:none!important}.repository.file.editor .tab[data-tab=write] .CodeMirror{border-left:none;border-right:none;border-bottom:none}.organization{padding-top:15px;padding-bottom:80px}.organization .head .ui.header .text{vertical-align:middle;font-size:1.6rem;margin-left:15px}.organization .head .ui.header .ui.right{margin-top:5px}.organization.new.org form{margin:auto}.organization.new.org form .ui.message{text-align:center}@media only screen and (min-width:768px){.organization.new.org form{width:800px!important}.organization.new.org form .header{padding-left:280px!important}.organization.new.org form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.organization.new.org form .help{margin-left:265px!important}.organization.new.org form .optional .title{margin-left:250px!important}.organization.new.org form input,.organization.new.org form textarea{width:50%!important}}@media only screen and (max-width:767px){.organization.new.org form .optional .title{margin-left:15px}.organization.new.org form .inline.field>label{display:block}}.organization.new.org form .header{padding-left:0!important;text-align:center}.organization.options input{min-width:300px}.organization.profile #org-avatar{width:100px;height:100px;margin-right:15px}.organization.profile #org-info .ui.header{font-size:36px;margin-bottom:0}.organization.profile #org-info .desc{font-size:16px;margin-bottom:10px}.organization.profile #org-info .meta .item{display:inline-block;margin-right:10px}.organization.profile #org-info .meta .item .icon{margin-right:5px}.organization.profile .ui.top.header .ui.right{margin-top:0}.organization.profile .teams .item{padding:10px 15px}.organization.profile .members .ui.avatar,.organization.teams .members .ui.avatar{width:48px;height:48px;margin-right:5px}.organization.invite #invite-box{margin:auto;margin-top:50px;width:500px!important}.organization.invite #invite-box #search-user-box input{margin-left:0;width:300px}.organization.invite #invite-box .ui.button{margin-left:5px;margin-top:-3px}.organization.members .list .item{margin-left:0;margin-right:0;border-bottom:1px solid #eee}.organization.members .list .item .ui.avatar{width:48px;height:48px}.organization.members .list .item .meta{line-height:24px}.organization.teams .detail .item{padding:10px 15px}.organization.teams .detail .item:not(:last-child){border-bottom:1px solid #eee}.organization.teams .members .item,.organization.teams .repositories .item{padding:10px 20px;line-height:32px}.organization.teams .members .item:not(:last-child),.organization.teams .repositories .item:not(:last-child){border-bottom:1px solid #DDD}.organization.teams .members .item .button,.organization.teams .repositories .item .button{padding:9px 10px}.organization.teams #add-member-form input,.organization.teams #add-repo-form input{margin-left:0}.organization.teams #add-member-form .ui.button,.organization.teams #add-repo-form .ui.button{margin-left:5px;margin-top:-3px}.user:not(.icon){padding-top:15px;padding-bottom:80px}.user.profile .ui.card .username{display:block}.user.profile .ui.card .extra.content{padding:0}.user.profile .ui.card .extra.content ul{margin:0;padding:0}.user.profile .ui.card .extra.content ul li{padding:10px;list-style:none}.user.profile .ui.card .extra.content ul li:not(:last-child){border-bottom:1px solid #eaeaea}.user.profile .ui.card .extra.content ul li .octicon{margin-left:1px;margin-right:5px}.user.profile .ui.card .extra.content ul li.follow .ui.button{width:100%}.user.profile .ui.repository.list{margin-top:25px}.user.followers .header.name{font-size:20px;line-height:24px;vertical-align:middle}.user.followers .follow .ui.button{padding:8px 15px}.user.notification .octicon{float:left;font-size:2em}.user.notification .content{float:left;margin-left:7px}.user.notification table form{display:inline-block}.user.notification table button{padding:3px 3px 3px 5px}.user.notification table tr{cursor:pointer}.user.notification .octicon.green{color:#21ba45}.user.notification .octicon.red{color:#d01919}.user.notification .octicon.purple{color:#a333c8}.user.notification .octicon.blue{color:#2185d0}.user.link-account:not(.icon){padding-top:15px;padding-bottom:5px}.user.settings .iconFloat{float:left}.dashboard{padding-top:15px;padding-bottom:80px}.dashboard.feeds .context.user.menu,.dashboard.issues .context.user.menu{z-index:101;min-width:200px}.dashboard.feeds .context.user.menu .ui.header,.dashboard.issues .context.user.menu .ui.header{font-size:1rem;text-transform:none}.dashboard.feeds .filter.menu .item,.dashboard.issues .filter.menu .item{text-align:left}.dashboard.feeds .filter.menu .item .text,.dashboard.issues .filter.menu .item .text{height:16px;vertical-align:middle}.dashboard.feeds .filter.menu .item .text.truncate,.dashboard.issues .filter.menu .item .text.truncate{width:85%}.dashboard.feeds .filter.menu .item .floating.label,.dashboard.issues .filter.menu .item .floating.label{top:7px;left:90%;width:15%}.dashboard.feeds .filter.menu .jump.item,.dashboard.issues .filter.menu .jump.item{margin:1px;padding-right:0}.dashboard.feeds .filter.menu .menu,.dashboard.issues .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.dashboard.feeds .right.stackable.menu>.item.active,.dashboard.issues .right.stackable.menu>.item.active{color:#d9453d}.dashboard .dashboard-repos{margin:0 1px}.feeds .news>.ui.grid{margin-left:auto;margin-right:auto}.feeds .news .ui.avatar{margin-top:13px}.feeds .news p{line-height:1em}.feeds .news .time-since{font-size:13px}.feeds .news .issue.title{width:80%}.feeds .news .push.news .content ul{font-size:13px;list-style:none;padding-left:10px}.feeds .news .push.news .content ul img{margin-bottom:-2px}.feeds .news .push.news .content ul .text.truncate{width:80%;margin-bottom:-5px}.feeds .news .commit-id{font-family:Consolas,monospace}.feeds .news code{padding:1px;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px;word-break:break-all}.feeds .list .header .ui.label{margin-top:-4px;padding:4px 5px;font-weight:400}.feeds .list .header .plus.icon{margin-top:5px}.feeds .list ul{list-style:none;margin:0;padding-left:0}.feeds .list ul li:not(:last-child){border-bottom:1px solid #EAEAEA}.feeds .list ul li.private{background-color:#fcf8e9}.feeds .list ul li a{padding:6px 1.2em;display:block}.feeds .list ul li a .octicon{color:#888}.feeds .list ul li a .octicon.rear{font-size:15px}.feeds .list ul li a .star-num{font-size:12px}.feeds .list .repo-owner-name-list .item-name{max-width:70%;margin-bottom:-4px}.feeds .list #collaborative-repo-list .owner-and-repo{max-width:80%;margin-bottom:-5px}.feeds .list #collaborative-repo-list .owner-name{max-width:120px;margin-bottom:-5px}.admin{padding-top:15px;padding-bottom:80px}.admin .table.segment{padding:0;font-size:13px}.admin .table.segment:not(.striped){padding-top:5px}.admin .table.segment:not(.striped) thead th:last-child{padding-right:5px!important}.admin .table.segment th{padding-top:5px;padding-bottom:5px}.admin .table.segment:not(.select) td:first-of-type,.admin .table.segment:not(.select) th:first-of-type{padding-left:15px!important}.admin .ui.header,.admin .ui.segment{box-shadow:0 1px 2px 0 rgba(34,36,38,.15)}.admin.user .email{max-width:200px}.admin dl.admin-dl-horizontal{padding:20px;margin:0}.admin dl.admin-dl-horizontal dd{margin-left:275px}.admin dl.admin-dl-horizontal dt{font-weight:bolder;float:left;width:285px;clear:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.admin.config #test-mail-btn{margin-left:5px}.explore{padding-top:15px;padding-bottom:80px}.explore .navbar{justify-content:center;padding-top:15px!important;margin-top:-15px!important;margin-bottom:15px!important;background-color:#FAFAFA!important;border-width:1px!important}.explore .navbar .octicon{width:16px;text-align:center;margin-right:5px}.ui.repository.list .item{padding-bottom:25px}.ui.repository.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}.ui.repository.list .item .ui.header{font-size:1.5rem;padding-bottom:10px}.ui.repository.list .item .ui.header .name{word-break:break-all}.ui.repository.list .item .ui.header .metas{color:#888;font-size:14px;font-weight:400}.ui.repository.list .item .ui.header .metas span:not(:last-child){margin-right:5px}.ui.repository.list .item .time{font-size:12px;color:grey}.ui.repository.branches .time{font-size:12px;color:grey}.ui.user.list .item{padding-bottom:25px}.ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}.ui.user.list .item .ui.avatar.image{width:40px;height:40px}.ui.user.list .item .description{margin-top:5px}.ui.user.list .item .description .octicon:not(:first-child){margin-left:5px}.ui.user.list .item .description a{color:#333}.ui.user.list .item .description a:hover{text-decoration:underline} \ No newline at end of file diff --git a/public/js/index.js b/public/js/index.js index 300ea0ee0d754..f7129f0992df7 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -196,7 +196,7 @@ function initCommentForm() { $listMenu.find('.item:not(.no-select)').click(function () { // we don't need the action attribute when updating assignees - if (selector == 'select-assignees') { + if (selector == 'select-assignees-modify') { // UI magic. We need to do this here, otherwise it would destroy the functionality of // adding/removing labels @@ -214,7 +214,7 @@ function initCommentForm() { $listMenu.data('issue-id'), $(this).data('id') ); - $listMenu.data('action', 'update'); + $listMenu.data('action', 'update'); // Update to reload the page when we updated items return false; } @@ -260,7 +260,8 @@ function initCommentForm() { return false; }); $listMenu.find('.no-select.item').click(function () { - if (hasLabelUpdateAction) { + console.log('clear'); + if (hasLabelUpdateAction || selector == 'select-assignees-modify') { updateIssuesMeta( $listMenu.data('update-url'), "clear", @@ -279,12 +280,15 @@ function initCommentForm() { }); $noSelect.removeClass('hide'); $($(this).parent().data('id')).val(''); + + $listMenu.data('action', 'update'); // Update to reload the page when we updated items }); } // Init labels and assignees initListSubmits('select-label', 'labels'); initListSubmits('select-assignees', 'assignees'); + initListSubmits('select-assignees-modify', 'assignees'); function selectItem(select_id, input_id) { var $menu = $(select_id + ' .menu'); @@ -2224,4 +2228,4 @@ function initTopicbar() { }, }, }); -} \ No newline at end of file +} diff --git a/public/less/_repository.less b/public/less/_repository.less index 3bbfe33ef52dd..8930518876996 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -119,8 +119,11 @@ } .octicon { float: left; - margin-left: -5px; - margin-right: -7px; + margin: 5px -7px 0 -5px; + width: 16px; + } + .text{ + margin-left: 0.9em; } .menu { max-height: 300px; @@ -1741,4 +1744,4 @@ tbody.commit-list { #repo-topic { margin-top: 5px; -} \ No newline at end of file +} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 92b0d73696f50..e904ca4ba7d15 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -107,8 +107,8 @@
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} - - + + {{.Name}} @@ -117,13 +117,13 @@
- {{.i18n.Tr "repo.issues.new.no_assignees"}} + {{.i18n.Tr "repo.issues.new.no_assignees"}} - {{range .Assignees}} - -  {{.Name}} - - {{end}} + {{range .Assignees}} + +  {{.Name}} + + {{end}}