From 338d03ce2f05fcc49a577b58a6cfa6beb7996fd1 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Wed, 26 Jul 2023 13:26:31 +0800 Subject: [PATCH] Only show newly pushed branches message in the same repository (#26148) Partly fixes #26130 This is a quick fix. #25812 will fully fix the bug. --- models/git/branch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/git/branch.go b/models/git/branch.go index d57b72719..c68da1be7 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -394,6 +394,7 @@ func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64, ex err := db.GetEngine(ctx). Where("pusher_id=? AND is_deleted=?", userID, false). And("name <> ?", excludeBranchName). + And("repo_id = ?", repoID). And("updated_unix >= ?", time.Now().Add(-time.Hour*6).Unix()). NotIn("name", subQuery). OrderBy("branch.updated_unix DESC").