Fix bug when pushing to a pull request which enabled dismiss approval automatically (#25882)

+1 -1

models/issues/issue.go

··· 551 551 552 552 // GetIssuesByIDs return issues with the given IDs. 553 553 func GetIssuesByIDs(ctx context.Context, issueIDs []int64) (IssueList, error) { 554 - issues := make([]*Issue, 0, 10) 554 + issues := make([]*Issue, 0, len(issueIDs)) 555 555 return issues, db.GetEngine(ctx).In("id", issueIDs).Find(&issues) 556 556 } 557 557

+6 -8

models/issues/pull.go

··· 316 316 return err 317 317 } 318 318 319 - if len(reviews) > 0 { 320 - err = LoadReviewers(ctx, reviews) 321 - if err != nil { 322 - return err 323 - } 324 - for _, review := range reviews { 325 - pr.RequestedReviewers = append(pr.RequestedReviewers, review.Reviewer) 326 - } 319 + if err = reviews.LoadReviewers(ctx); err != nil { 320 + return err 321 + } 322 + for _, review := range reviews { 323 + pr.RequestedReviewers = append(pr.RequestedReviewers, review.Reviewer) 327 324 } 325 + 328 326 return nil 329 327 } 330 328

+2 -158

models/issues/review.go

··· 162 162 return err 163 163 } 164 164 165 - // LoadReviewers loads reviewers 166 - func LoadReviewers(ctx context.Context, reviews []*Review) (err error) { 167 - reviewerIds := make([]int64, len(reviews)) 168 - for i := 0; i < len(reviews); i++ { 169 - reviewerIds[i] = reviews[i].ReviewerID 170 - } 171 - reviewers, err := user_model.GetPossibleUserByIDs(ctx, reviewerIds) 172 - if err != nil { 173 - return err 174 - } 175 - 176 - userMap := make(map[int64]*user_model.User, len(reviewers)) 177 - for _, reviewer := range reviewers { 178 - userMap[reviewer.ID] = reviewer 179 - } 180 - for _, review := range reviews { 181 - review.Reviewer = userMap[review.ReviewerID] 182 - } 183 - return nil 184 - } 185 - 186 165 // LoadReviewerTeam loads reviewer team 187 166 func (r *Review) LoadReviewerTeam(ctx context.Context) (err error) { 188 167 if r.ReviewerTeamID == 0 || r.ReviewerTeam != nil { ··· 236 215 } 237 216 } 238 217 239 - // FindReviewOptions represent possible filters to find reviews 240 - type FindReviewOptions struct { 241 - db.ListOptions 242 - Type ReviewType 243 - IssueID int64 244 - ReviewerID int64 245 - OfficialOnly bool 246 - } 247 - 248 - func (opts *FindReviewOptions) toCond() builder.Cond { 249 - cond := builder.NewCond() 250 - if opts.IssueID > 0 { 251 - cond = cond.And(builder.Eq{"issue_id": opts.IssueID}) 252 - } 253 - if opts.ReviewerID > 0 { 254 - cond = cond.And(builder.Eq{"reviewer_id": opts.ReviewerID}) 255 - } 256 - if opts.Type != ReviewTypeUnknown { 257 - cond = cond.And(builder.Eq{"type": opts.Type}) 258 - } 259 - if opts.OfficialOnly { 260 - cond = cond.And(builder.Eq{"official": true}) 261 - } 262 - return cond 263 - } 264 - 265 - // FindReviews returns reviews passing FindReviewOptions 266 - func FindReviews(ctx context.Context, opts FindReviewOptions) ([]*Review, error) { 267 - reviews := make([]*Review, 0, 10) 268 - sess := db.GetEngine(ctx).Where(opts.toCond()) 269 - if opts.Page > 0 { 270 - sess = db.SetSessionPagination(sess, &opts) 271 - } 272 - return reviews, sess. 273 - Asc("created_unix"). 274 - Asc("id"). 275 - Find(&reviews) 276 - } 277 - 278 - // FindLatestReviews returns only latest reviews per user, passing FindReviewOptions 279 - func FindLatestReviews(ctx context.Context, opts FindReviewOptions) ([]*Review, error) { 280 - reviews := make([]*Review, 0, 10) 281 - cond := opts.toCond() 282 - sess := db.GetEngine(ctx).Where(cond) 283 - if opts.Page > 0 { 284 - sess = db.SetSessionPagination(sess, &opts) 285 - } 286 - 287 - sess.In("id", builder. 288 - Select("max ( id ) "). 289 - From("review"). 290 - Where(cond). 291 - GroupBy("reviewer_id")) 292 - 293 - return reviews, sess. 294 - Asc("created_unix"). 295 - Asc("id"). 296 - Find(&reviews) 297 - } 298 - 299 - // CountReviews returns count of reviews passing FindReviewOptions 300 - func CountReviews(opts FindReviewOptions) (int64, error) { 301 - return db.GetEngine(db.DefaultContext).Where(opts.toCond()).Count(&Review{}) 302 - } 303 - 304 218 // CreateReviewOptions represent the options to create a review. Type, Issue and Reviewer are required. 305 219 type CreateReviewOptions struct { 306 220 Content string ··· 533 447 return review, comm, committer.Commit() 534 448 } 535 449 536 - // GetReviewOptions represent filter options for GetReviews 537 - type GetReviewOptions struct { 538 - IssueID int64 539 - ReviewerID int64 540 - Dismissed util.OptionalBool 541 - } 542 - 543 - // GetReviews return reviews based on GetReviewOptions 544 - func GetReviews(ctx context.Context, opts *GetReviewOptions) ([]*Review, error) { 545 - if opts == nil { 546 - return nil, fmt.Errorf("opts are nil") 547 - } 548 - 549 - sess := db.GetEngine(ctx) 550 - 551 - if opts.IssueID != 0 { 552 - sess = sess.Where("issue_id=?", opts.IssueID) 553 - } 554 - if opts.ReviewerID != 0 { 555 - sess = sess.Where("reviewer_id=?", opts.ReviewerID) 556 - } 557 - if !opts.Dismissed.IsNone() { 558 - sess = sess.Where("dismissed=?", opts.Dismissed.IsTrue()) 559 - } 560 - 561 - reviews := make([]*Review, 0, 4) 562 - return reviews, sess.Find(&reviews) 563 - } 564 - 565 - // GetReviewsByIssueID gets the latest review of each reviewer for a pull request 566 - func GetReviewsByIssueID(issueID int64) ([]*Review, error) { 567 - reviews := make([]*Review, 0, 10) 568 - 569 - sess := db.GetEngine(db.DefaultContext) 570 - 571 - // Get latest review of each reviewer, sorted in order they were made 572 - if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND dismissed = ? AND original_author_id = 0 GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC", 573 - issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, false). 574 - Find(&reviews); err != nil { 575 - return nil, err 576 - } 577 - 578 - teamReviewRequests := make([]*Review, 0, 5) 579 - if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id <> 0 AND original_author_id = 0 GROUP BY issue_id, reviewer_team_id) ORDER BY review.updated_unix ASC", 580 - issueID). 581 - Find(&teamReviewRequests); err != nil { 582 - return nil, err 583 - } 584 - 585 - if len(teamReviewRequests) > 0 { 586 - reviews = append(reviews, teamReviewRequests...) 587 - } 588 - 589 - return reviews, nil 590 - } 591 - 592 - // GetReviewersFromOriginalAuthorsByIssueID gets the latest review of each original authors for a pull request 593 - func GetReviewersFromOriginalAuthorsByIssueID(issueID int64) ([]*Review, error) { 594 - reviews := make([]*Review, 0, 10) 595 - 596 - // Get latest review of each reviewer, sorted in order they were made 597 - if err := db.GetEngine(db.DefaultContext).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND original_author_id <> 0 GROUP BY issue_id, original_author_id) ORDER BY review.updated_unix ASC", 598 - issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest). 599 - Find(&reviews); err != nil { 600 - return nil, err 601 - } 602 - 603 - return reviews, nil 604 - } 605 - 606 450 // GetReviewByIssueIDAndUserID get the latest review of reviewer for a pull request 607 451 func GetReviewByIssueIDAndUserID(ctx context.Context, issueID, userID int64) (*Review, error) { 608 452 review := new(Review) ··· 654 498 } 655 499 656 500 // DismissReview change the dismiss status of a review 657 - func DismissReview(review *Review, isDismiss bool) (err error) { 501 + func DismissReview(ctx context.Context, review *Review, isDismiss bool) (err error) { 658 502 if review.Dismissed == isDismiss || (review.Type != ReviewTypeApprove && review.Type != ReviewTypeReject) { 659 503 return nil 660 504 } ··· 665 509 return ErrReviewNotExist{} 666 510 } 667 511 668 - _, err = db.GetEngine(db.DefaultContext).ID(review.ID).Cols("dismissed").Update(review) 512 + _, err = db.GetEngine(ctx).ID(review.ID).Cols("dismissed").Update(review) 669 513 670 514 return err 671 515 }

+172

models/issues/review_list.go

··· 1 + // Copyright 2023 The Gitea Authors. All rights reserved. 2 + // SPDX-License-Identifier: MIT 3 + 4 + package issues 5 + 6 + import ( 7 + "context" 8 + 9 + "code.gitea.io/gitea/models/db" 10 + user_model "code.gitea.io/gitea/models/user" 11 + "code.gitea.io/gitea/modules/container" 12 + "code.gitea.io/gitea/modules/util" 13 + 14 + "xorm.io/builder" 15 + ) 16 + 17 + type ReviewList []*Review 18 + 19 + // LoadReviewers loads reviewers 20 + func (reviews ReviewList) LoadReviewers(ctx context.Context) error { 21 + reviewerIds := make([]int64, len(reviews)) 22 + for i := 0; i < len(reviews); i++ { 23 + reviewerIds[i] = reviews[i].ReviewerID 24 + } 25 + reviewers, err := user_model.GetPossibleUserByIDs(ctx, reviewerIds) 26 + if err != nil { 27 + return err 28 + } 29 + 30 + userMap := make(map[int64]*user_model.User, len(reviewers)) 31 + for _, reviewer := range reviewers { 32 + userMap[reviewer.ID] = reviewer 33 + } 34 + for _, review := range reviews { 35 + review.Reviewer = userMap[review.ReviewerID] 36 + } 37 + return nil 38 + } 39 + 40 + func (reviews ReviewList) LoadIssues(ctx context.Context) error { 41 + issueIds := container.Set[int64]{} 42 + for i := 0; i < len(reviews); i++ { 43 + issueIds.Add(reviews[i].IssueID) 44 + } 45 + 46 + issues, err := GetIssuesByIDs(ctx, issueIds.Values()) 47 + if err != nil { 48 + return err 49 + } 50 + if _, err := issues.LoadRepositories(ctx); err != nil { 51 + return err 52 + } 53 + issueMap := make(map[int64]*Issue, len(issues)) 54 + for _, issue := range issues { 55 + issueMap[issue.ID] = issue 56 + } 57 + 58 + for _, review := range reviews { 59 + review.Issue = issueMap[review.IssueID] 60 + } 61 + return nil 62 + } 63 + 64 + // FindReviewOptions represent possible filters to find reviews 65 + type FindReviewOptions struct { 66 + db.ListOptions 67 + Type ReviewType 68 + IssueID int64 69 + ReviewerID int64 70 + OfficialOnly bool 71 + Dismissed util.OptionalBool 72 + } 73 + 74 + func (opts *FindReviewOptions) toCond() builder.Cond { 75 + cond := builder.NewCond() 76 + if opts.IssueID > 0 { 77 + cond = cond.And(builder.Eq{"issue_id": opts.IssueID}) 78 + } 79 + if opts.ReviewerID > 0 { 80 + cond = cond.And(builder.Eq{"reviewer_id": opts.ReviewerID}) 81 + } 82 + if opts.Type != ReviewTypeUnknown { 83 + cond = cond.And(builder.Eq{"type": opts.Type}) 84 + } 85 + if opts.OfficialOnly { 86 + cond = cond.And(builder.Eq{"official": true}) 87 + } 88 + if !opts.Dismissed.IsNone() { 89 + cond = cond.And(builder.Eq{"dismissed": opts.Dismissed.IsTrue()}) 90 + } 91 + return cond 92 + } 93 + 94 + // FindReviews returns reviews passing FindReviewOptions 95 + func FindReviews(ctx context.Context, opts FindReviewOptions) (ReviewList, error) { 96 + reviews := make([]*Review, 0, 10) 97 + sess := db.GetEngine(ctx).Where(opts.toCond()) 98 + if opts.Page > 0 && !opts.IsListAll() { 99 + sess = db.SetSessionPagination(sess, &opts) 100 + } 101 + return reviews, sess. 102 + Asc("created_unix"). 103 + Asc("id"). 104 + Find(&reviews) 105 + } 106 + 107 + // FindLatestReviews returns only latest reviews per user, passing FindReviewOptions 108 + func FindLatestReviews(ctx context.Context, opts FindReviewOptions) (ReviewList, error) { 109 + reviews := make([]*Review, 0, 10) 110 + cond := opts.toCond() 111 + sess := db.GetEngine(ctx).Where(cond) 112 + if opts.Page > 0 { 113 + sess = db.SetSessionPagination(sess, &opts) 114 + } 115 + 116 + sess.In("id", builder. 117 + Select("max ( id ) "). 118 + From("review"). 119 + Where(cond). 120 + GroupBy("reviewer_id")) 121 + 122 + return reviews, sess. 123 + Asc("created_unix"). 124 + Asc("id"). 125 + Find(&reviews) 126 + } 127 + 128 + // CountReviews returns count of reviews passing FindReviewOptions 129 + func CountReviews(opts FindReviewOptions) (int64, error) { 130 + return db.GetEngine(db.DefaultContext).Where(opts.toCond()).Count(&Review{}) 131 + } 132 + 133 + // GetReviewersFromOriginalAuthorsByIssueID gets the latest review of each original authors for a pull request 134 + func GetReviewersFromOriginalAuthorsByIssueID(issueID int64) (ReviewList, error) { 135 + reviews := make([]*Review, 0, 10) 136 + 137 + // Get latest review of each reviewer, sorted in order they were made 138 + if err := db.GetEngine(db.DefaultContext).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND original_author_id <> 0 GROUP BY issue_id, original_author_id) ORDER BY review.updated_unix ASC", 139 + issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest). 140 + Find(&reviews); err != nil { 141 + return nil, err 142 + } 143 + 144 + return reviews, nil 145 + } 146 + 147 + // GetReviewsByIssueID gets the latest review of each reviewer for a pull request 148 + func GetReviewsByIssueID(issueID int64) (ReviewList, error) { 149 + reviews := make([]*Review, 0, 10) 150 + 151 + sess := db.GetEngine(db.DefaultContext) 152 + 153 + // Get latest review of each reviewer, sorted in order they were made 154 + if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND dismissed = ? AND original_author_id = 0 GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC", 155 + issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, false). 156 + Find(&reviews); err != nil { 157 + return nil, err 158 + } 159 + 160 + teamReviewRequests := make([]*Review, 0, 5) 161 + if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id <> 0 AND original_author_id = 0 GROUP BY issue_id, reviewer_team_id) ORDER BY review.updated_unix ASC", 162 + issueID). 163 + Find(&teamReviewRequests); err != nil { 164 + return nil, err 165 + } 166 + 167 + if len(teamReviewRequests) > 0 { 168 + reviews = append(reviews, teamReviewRequests...) 169 + } 170 + 171 + return reviews, nil 172 + }

+8 -8

models/issues/review_test.go

··· 159 159 160 160 allReviews, err = issues_model.GetReviewsByIssueID(issue.ID) 161 161 assert.NoError(t, err) 162 - assert.NoError(t, issues_model.LoadReviewers(db.DefaultContext, allReviews)) 162 + assert.NoError(t, allReviews.LoadReviewers(db.DefaultContext)) 163 163 if assert.Len(t, allReviews, 3) { 164 164 for i, review := range allReviews { 165 165 assert.Equal(t, expectedReviews[i].Reviewer, review.Reviewer) ··· 179 179 assert.False(t, requestReviewExample.Dismissed) 180 180 assert.False(t, approveReviewExample.Dismissed) 181 181 182 - assert.NoError(t, issues_model.DismissReview(rejectReviewExample, true)) 182 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, rejectReviewExample, true)) 183 183 rejectReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 9}) 184 184 requestReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 11}) 185 185 assert.True(t, rejectReviewExample.Dismissed) 186 186 assert.False(t, requestReviewExample.Dismissed) 187 187 188 - assert.NoError(t, issues_model.DismissReview(requestReviewExample, true)) 188 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, requestReviewExample, true)) 189 189 rejectReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 9}) 190 190 requestReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 11}) 191 191 assert.True(t, rejectReviewExample.Dismissed) 192 192 assert.False(t, requestReviewExample.Dismissed) 193 193 assert.False(t, approveReviewExample.Dismissed) 194 194 195 - assert.NoError(t, issues_model.DismissReview(requestReviewExample, true)) 195 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, requestReviewExample, true)) 196 196 rejectReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 9}) 197 197 requestReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 11}) 198 198 assert.True(t, rejectReviewExample.Dismissed) 199 199 assert.False(t, requestReviewExample.Dismissed) 200 200 assert.False(t, approveReviewExample.Dismissed) 201 201 202 - assert.NoError(t, issues_model.DismissReview(requestReviewExample, false)) 202 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, requestReviewExample, false)) 203 203 rejectReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 9}) 204 204 requestReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 11}) 205 205 assert.True(t, rejectReviewExample.Dismissed) 206 206 assert.False(t, requestReviewExample.Dismissed) 207 207 assert.False(t, approveReviewExample.Dismissed) 208 208 209 - assert.NoError(t, issues_model.DismissReview(requestReviewExample, false)) 209 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, requestReviewExample, false)) 210 210 rejectReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 9}) 211 211 requestReviewExample = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 11}) 212 212 assert.True(t, rejectReviewExample.Dismissed) 213 213 assert.False(t, requestReviewExample.Dismissed) 214 214 assert.False(t, approveReviewExample.Dismissed) 215 215 216 - assert.NoError(t, issues_model.DismissReview(rejectReviewExample, false)) 216 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, rejectReviewExample, false)) 217 217 assert.False(t, rejectReviewExample.Dismissed) 218 218 assert.False(t, requestReviewExample.Dismissed) 219 219 assert.False(t, approveReviewExample.Dismissed) 220 220 221 - assert.NoError(t, issues_model.DismissReview(approveReviewExample, true)) 221 + assert.NoError(t, issues_model.DismissReview(db.DefaultContext, approveReviewExample, true)) 222 222 assert.False(t, rejectReviewExample.Dismissed) 223 223 assert.False(t, requestReviewExample.Dismissed) 224 224 assert.True(t, approveReviewExample.Dismissed)

+11

services/pull/pull.go

··· 309 309 if err := issues_model.MarkReviewsAsStale(pr.IssueID); err != nil { 310 310 log.Error("MarkReviewsAsStale: %v", err) 311 311 } 312 + 313 + // dismiss all approval reviews if protected branch rule item enabled. 314 + pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch) 315 + if err != nil { 316 + log.Error("GetFirstMatchProtectedBranchRule: %v", err) 317 + } 318 + if pb != nil && pb.DismissStaleApprovals { 319 + if err := DismissApprovalReviews(ctx, doer, pr); err != nil { 320 + log.Error("DismissApprovalReviews: %v", err) 321 + } 322 + } 312 323 } 313 324 if err := issues_model.MarkReviewsAsNotStale(pr.IssueID, newCommitID); err != nil { 314 325 log.Error("MarkReviewsAsNotStale: %v", err)

+49 -6

services/pull/review.go

··· 316 316 return review, comm, nil 317 317 } 318 318 319 + // DismissApprovalReviews dismiss all approval reviews because of new commits 320 + func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *issues_model.PullRequest) error { 321 + reviews, err := issues_model.FindReviews(ctx, issues_model.FindReviewOptions{ 322 + ListOptions: db.ListOptions{ 323 + ListAll: true, 324 + }, 325 + IssueID: pull.IssueID, 326 + Type: issues_model.ReviewTypeApprove, 327 + Dismissed: util.OptionalBoolFalse, 328 + }) 329 + if err != nil { 330 + return err 331 + } 332 + 333 + if err := reviews.LoadIssues(ctx); err != nil { 334 + return err 335 + } 336 + 337 + return db.WithTx(ctx, func(subCtx context.Context) error { 338 + for _, review := range reviews { 339 + if err := issues_model.DismissReview(subCtx, review, true); err != nil { 340 + return err 341 + } 342 + 343 + comment, err := issue_service.CreateComment(ctx, &issues_model.CreateCommentOptions{ 344 + Doer: doer, 345 + Content: "New commits pushed, approval review dismissed automatically according to repository settings", 346 + Type: issues_model.CommentTypeDismissReview, 347 + ReviewID: review.ID, 348 + Issue: review.Issue, 349 + Repo: review.Issue.Repo, 350 + }) 351 + if err != nil { 352 + return err 353 + } 354 + 355 + comment.Review = review 356 + comment.Poster = doer 357 + comment.Issue = review.Issue 358 + 359 + notification.NotifyPullReviewDismiss(ctx, doer, review, comment) 360 + } 361 + return nil 362 + }) 363 + } 364 + 319 365 // DismissReview dismissing stale review by repo admin 320 366 func DismissReview(ctx context.Context, reviewID, repoID int64, message string, doer *user_model.User, isDismiss, dismissPriors bool) (comment *issues_model.Comment, err error) { 321 367 review, err := issues_model.GetReviewByID(ctx, reviewID) ··· 337 383 return nil, fmt.Errorf("reviews's repository is not the same as the one we expect") 338 384 } 339 385 340 - if err := issues_model.DismissReview(review, isDismiss); err != nil { 386 + if err := issues_model.DismissReview(ctx, review, isDismiss); err != nil { 341 387 return nil, err 342 388 } 343 389 344 390 if dismissPriors { 345 - reviews, err := issues_model.GetReviews(ctx, &issues_model.GetReviewOptions{ 391 + reviews, err := issues_model.FindReviews(ctx, issues_model.FindReviewOptions{ 346 392 IssueID: review.IssueID, 347 393 ReviewerID: review.ReviewerID, 348 394 Dismissed: util.OptionalBoolFalse, ··· 351 397 return nil, err 352 398 } 353 399 for _, oldReview := range reviews { 354 - if err = issues_model.DismissReview(oldReview, true); err != nil { 400 + if err = issues_model.DismissReview(ctx, oldReview, true); err != nil { 355 401 return nil, err 356 402 } 357 403 } ··· 361 407 return nil, nil 362 408 } 363 409 364 - if err := review.Issue.LoadPullRequest(ctx); err != nil { 365 - return nil, err 366 - } 367 410 if err := review.Issue.LoadAttributes(ctx); err != nil { 368 411 return nil, err 369 412 }

+2 -2

services/repository/push.go

··· 257 257 commits.Commits = commits.Commits[:setting.UI.FeedMaxCommitNum] 258 258 } 259 259 260 - notification.NotifyPushCommits(ctx, pusher, repo, opts, commits) 261 - 262 260 if err = git_model.UpdateBranch(ctx, repo.ID, opts.PusherID, branch, newCommit); err != nil { 263 261 return fmt.Errorf("git_model.UpdateBranch %s:%s failed: %v", repo.FullName(), branch, err) 264 262 } 263 + 264 + notification.NotifyPushCommits(ctx, pusher, repo, opts, commits) 265 265 266 266 // Cache for big repository 267 267 if err := CacheRef(graceful.GetManager().HammerContext(), repo, gitRepo, opts.RefFullName); err != nil {

Configure Feed

Configure Feed