Merge branch 'main' into lunny/fix_missed_migration

go-gitea · Mar 15, 2023 · 18282ab · 18282ab
2 parents 4034d2c + 0d7cf7b
commit 18282ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "vue-bar-graph": "2.0.0",
     "vue-loader": "17.0.1",
     "vue3-calendar-heatmap": "2.0.0",
-    "webpack": "5.75.0",
+    "webpack": "5.76.0",
     "webpack-cli": "5.0.1",
     "workbox-routing": "6.5.4",
     "workbox-strategies": "6.5.4",

diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -274,9 +274,12 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
 				continue
 			}
 
+			// If the PR is closed, someone still push some commits to the PR,
+			// 1. We will insert comments of commits, but hidden until the PR is reopened.
+			// 2. We won't send any notification.
 			AddToTaskQueue(pr)
 			comment, err := CreatePushPullComment(ctx, doer, pr, oldCommitID, newCommitID)
-			if err == nil && comment != nil {
+			if err == nil && comment != nil && !pr.Issue.IsClosed {
 				notification.NotifyPullRequestPushCommits(ctx, doer, pr, comment)
 			}
 		}