diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/action.go | 3 | ||||
| -rw-r--r-- | models/comment.go | 6 | ||||
| -rw-r--r-- | models/issue_mail.go | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/models/action.go b/models/action.go index 8b15f1cf..288a1812 100644 --- a/models/action.go +++ b/models/action.go @@ -379,8 +379,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err if ref[0] == '#' { ref = fmt.Sprintf("%s%s", repo.FullName(), ref) } else if !strings.Contains(ref, "/") { - // We don't support User#ID syntax yet - // return ErrNotImplemented + // FIXME: We don't support User#ID syntax yet continue } diff --git a/models/comment.go b/models/comment.go index 1be559b0..bcea2268 100644 --- a/models/comment.go +++ b/models/comment.go @@ -188,7 +188,7 @@ func (cmt *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) issue.Content = fmt.Sprintf("Reopened #%d", issue.Index) } if err = mailIssueCommentToParticipants(issue, cmt.Poster, mentions); err != nil { - log.Error(4, "mailIssueCommentToParticipants: %v", err) + log.Error(2, "mailIssueCommentToParticipants: %v", err) } return nil @@ -290,10 +290,10 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err // Notify watchers for whatever action comes in, ignore if no action type. if act.OpType > 0 { if err = notifyWatchers(e, act); err != nil { - log.Error(4, "notifyWatchers: %v", err) + log.Error(2, "notifyWatchers: %v", err) } if err = comment.mailParticipants(e, act.OpType, opts.Issue); err != nil { - log.Error(4, "MailParticipants: %v", err) + log.Error(2, "MailParticipants: %v", err) } } diff --git a/models/issue_mail.go b/models/issue_mail.go index 25f580d9..7ee38e63 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -155,7 +155,6 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string) tos = append(tos, mentions[i]) } mailer.SendIssueMentionMail(NewMailerIssue(issue), NewMailerRepo(issue.Repo), NewMailerUser(doer), GetUserEmailsByNames(tos)) - return nil } @@ -168,7 +167,7 @@ func (issue *Issue) MailParticipants() (err error) { } if err = mailIssueCommentToParticipants(issue, issue.Poster, mentions); err != nil { - log.Error(4, "mailIssueCommentToParticipants: %v", err) + log.Error(2, "mailIssueCommentToParticipants: %v", err) } return nil |