diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dd43297923..08e8450c8c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -760,6 +760,7 @@ issues.due_date_overdue = "Overdue" issues.review.approve = "approved these changes %s" issues.review.comment = "left review comments %s" issues.review.reject = "rejected these changes %s" +issues.review.pending = Pending pulls.desc = Enable merge requests and code reviews. pulls.new = New Pull Request diff --git a/routers/repo/issue.go b/routers/repo/issue.go index e232b77b33..a9100e5606 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -707,7 +707,7 @@ func ViewIssue(ctx *context.Context) { return } } else if comment.Type == models.CommentTypeCode || comment.Type == models.CommentTypeReview { - if err = comment.LoadReview(); err != nil { + if err = comment.LoadReview(); err != nil && !models.IsErrReviewNotExist(err) { ctx.ServerError("LoadReview", err) return } diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index e5702cfba8..f777d51b18 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -9,15 +9,9 @@