diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-07-20 15:18:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-20 15:18:52 +0800 |
| commit | 01c04607c76391e09620c6f2475b722207d2ee73 (patch) | |
| tree | ff1cdb3ef3b37f6e8ab3108999e1def1215414fe /models/issues/pull.go | |
| parent | cf467119ffa82177258226fd04946a2105ee7aa0 (diff) | |
| download | gitea-01c04607c76391e09620c6f2475b722207d2ee73.tar.gz gitea-01c04607c76391e09620c6f2475b722207d2ee73.zip | |
Fix bug when pushing to a pull request which enabled dismiss approval automatically (#25882)
Fix #25858
The option `dissmiss stale approvals` was listed on protected branch but
never implemented. This PR fixes that.
<img width="1006" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/60bfa968-4db7-4c24-b8be-2e5978f91bb9">
<img width="1021" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/8dabc14d-2dfe-40c2-94ed-24fcbf6e0e8f">
Diffstat (limited to 'models/issues/pull.go')
| -rw-r--r-- | models/issues/pull.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/models/issues/pull.go b/models/issues/pull.go index 2acc2b4226..cedbb62c3c 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -316,15 +316,13 @@ func (pr *PullRequest) LoadRequestedReviewers(ctx context.Context) error { return err } - if len(reviews) > 0 { - err = LoadReviewers(ctx, reviews) - if err != nil { - return err - } - for _, review := range reviews { - pr.RequestedReviewers = append(pr.RequestedReviewers, review.Reviewer) - } + if err = reviews.LoadReviewers(ctx); err != nil { + return err } + for _, review := range reviews { + pr.RequestedReviewers = append(pr.RequestedReviewers, review.Reviewer) + } + return nil } |