From 9a65d011f6b289dd6e7acb18a4b86c51d4d388ee Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Tue, 1 Aug 2023 15:25:11 +0800 Subject: Some fixes of the prompt of new branches (#26257) Related to #26239 This PR makes some fixes: - do not show the prompt for mirror repos and repos with pull request units disabled - use `commit_time` instead of `updated_unix`, as `commit_time` is the real time when the branch was pushed --- models/git/branch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'models/git') diff --git a/models/git/branch.go b/models/git/branch.go index c68da1be78..6d50fb9fb6 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -395,9 +395,9 @@ func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64, ex 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()). + And("commit_time >= ?", time.Now().Add(-time.Hour*6).Unix()). NotIn("name", subQuery). - OrderBy("branch.updated_unix DESC"). + OrderBy("branch.commit_time DESC"). Limit(2). Find(&branches) return branches, err -- cgit v1.2.3