From b707f368e46fc205d5ff4c7c740d0e6e0b1a062d Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 20:17:11 +0100
Subject: [PATCH 01/30] Add function to get recently pushed branches

---
 models/action.go     | 24 ++++++++++++++++++++++++
 routers/user/home.go |  6 ++++++
 2 files changed, 30 insertions(+)

diff --git a/models/action.go b/models/action.go
index e702a4263c9f1..de7d8b554d496 100644
--- a/models/action.go
+++ b/models/action.go
@@ -347,3 +347,27 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 
 	return actions, nil
 }
+
+// GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
+func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
+
+	limit := time.Now().Unix() - 3600
+
+	err = x.
+		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
+		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
+		Where(builder.And(
+			builder.Eq{"action.op_type": ActionCommitRepo},
+			builder.Eq{"action.act_user_id": user.ID},
+			builder.Eq{"pull_request.has_merged": false},
+			builder.Eq{"issue.is_closed": true},
+			builder.Gte{"action.created_unix": limit},
+		)).
+		Limit(10).
+		Find(&actions)
+	if err != nil {
+		return nil, err
+	}
+
+	return
+}
diff --git a/routers/user/home.go b/routers/user/home.go
index 779971ca97d40..8ad945a41aef8 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -161,6 +161,12 @@ func Dashboard(ctx *context.Context) {
 		IncludeDeleted:  false,
 	})
 
+	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctxUser)
+	if err != nil {
+		ctx.ServerError("GetRecentlyPushedBranches", err)
+		return
+	}
+
 	if ctx.Written() {
 		return
 	}

From c5dbe71336c950314ec6f15a5d3250cc0a71dae4 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 21:46:24 +0100
Subject: [PATCH 02/30] Fix query

---
 models/action.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/models/action.go b/models/action.go
index de7d8b554d496..c9d95e785f785 100644
--- a/models/action.go
+++ b/models/action.go
@@ -351,7 +351,7 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
 func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 
-	limit := time.Now().Unix() - 3600
+	limit := time.Now().Add(-24 * time.Hour).Unix()
 
 	err = x.
 		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
@@ -359,11 +359,18 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 		Where(builder.And(
 			builder.Eq{"action.op_type": ActionCommitRepo},
 			builder.Eq{"action.act_user_id": user.ID},
-			builder.Eq{"pull_request.has_merged": false},
-			builder.Eq{"issue.is_closed": true},
+			builder.Or(
+				builder.IsNull{"pull_request.id"},
+				builder.And(
+					builder.Eq{"pull_request.has_merged": false},
+					builder.Eq{"issue.is_closed": true},
+					builder.Gt{"action.created_unix": "issue.closed_unix"},
+				),
+			),
 			builder.Gte{"action.created_unix": limit},
 		)).
 		Limit(10).
+		Desc("action.id").
 		Find(&actions)
 	if err != nil {
 		return nil, err

From bedef4e5fa0c2ee0a92923426ad6b5e3b82a8fc2 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 21:46:43 +0100
Subject: [PATCH 03/30] Add template to show PR message

---
 templates/user/dashboard/dashboard.tmpl      | 1 +
 templates/user/recently_pushed_branches.tmpl | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 templates/user/recently_pushed_branches.tmpl

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 3eb8294e77250..82b415a0b5f67 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -2,6 +2,7 @@
 <div class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
+		{{template "user/recently_pushed_branches" .}}
 		{{template "base/alert" .}}
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui container ten wide column">
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
new file mode 100644
index 0000000000000..a1de38f2aa3ad
--- /dev/null
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -0,0 +1,3 @@
+{{range .RecentlyPushedBranches}}
+    {{.}}
+{{end}}
\ No newline at end of file

From b435472c8179064cde2ed9224ebc7d36b31c1d5a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 22:27:12 +0100
Subject: [PATCH 04/30] Show message to create a PR

---
 models/action.go                             | 26 ++++++++++++++++++++
 templates/user/recently_pushed_branches.tmpl |  9 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/models/action.go b/models/action.go
index c9d95e785f785..071d2fc960c64 100644
--- a/models/action.go
+++ b/models/action.go
@@ -376,5 +376,31 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 		return nil, err
 	}
 
+	repoIDs := []int64{}
+	for _, a := range actions {
+		repoIDs = append(repoIDs, a.RepoID)
+	}
+
+	repos := make(map[int64]*Repository, len(repoIDs))
+	err = x.In("id", repoIDs).Find(&repos)
+	if err != nil {
+		return nil, err
+	}
+
+	owners := make(map[int64]*User)
+	err = x.
+		In("repository.id", repoIDs).
+		Join("LEFT", "repository", "repository.owner_id = user.id").
+		Find(&owners)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range actions {
+		a.Repo = repos[a.RepoID]
+		a.Repo.Owner = owners[a.Repo.OwnerID]
+		a.RefName = strings.Replace(a.RefName, "refs/heads/", "", 1)
+	}
+
 	return
 }
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index a1de38f2aa3ad..44eb083a962e8 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,3 +1,10 @@
 {{range .RecentlyPushedBranches}}
-    {{.}}
+    <p>
+        You recently pushed to {{.Repo.Owner.Name}}/{{.Repo.LowerName}} on branch {{.RefName}}
+    	<a href="/{{.Repo.Owner.Name}}/{{.Repo.LowerName}}/compare/{{.Repo.DefaultBranch | EscapePound}}...{{if .Repo.IsFork}}{{.Repo.Owner.Name}}:{{end}}{{.RefName | EscapePound}}">
+    		<button id="new-pull-request" class="ui compact basic button">
+                {{$.i18n.Tr "repo.pulls.compare_changes"}}
+            </button>
+    	</a>
+    </p>
 {{end}}
\ No newline at end of file

From b3686afdaf5d53b4f3872ab710e6120984a3edda Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 22:54:42 +0100
Subject: [PATCH 05/30] Filter out pushes to the default branch of repositories

---
 models/action.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/models/action.go b/models/action.go
index 071d2fc960c64..39dde58dbc3a7 100644
--- a/models/action.go
+++ b/models/action.go
@@ -354,11 +354,17 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 	limit := time.Now().Add(-24 * time.Hour).Unix()
 
 	err = x.
-		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
+		Select("action.*, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
+		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
 		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
+		Join("LEFT", "repository", "action.repo_id = repository.id").
 		Where(builder.And(
 			builder.Eq{"action.op_type": ActionCommitRepo},
 			builder.Eq{"action.act_user_id": user.ID},
+			builder.Or(
+				builder.Expr("repository.default_branch != clean_ref_name"),
+				builder.Eq{"repository.is_fork": true},
+			),
 			builder.Or(
 				builder.IsNull{"pull_request.id"},
 				builder.And(
@@ -370,6 +376,7 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 			builder.Gte{"action.created_unix": limit},
 		)).
 		Limit(10).
+		GroupBy("clean_ref_name").
 		Desc("action.id").
 		Find(&actions)
 	if err != nil {

From 83d3a5f253fa33db8fd42a16fde6bbadddb6723c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 22:59:22 +0100
Subject: [PATCH 06/30] Make sure the group by statement works with other
 DBMSes too

---
 models/action.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/action.go b/models/action.go
index 39dde58dbc3a7..994036772ec6f 100644
--- a/models/action.go
+++ b/models/action.go
@@ -354,7 +354,7 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 	limit := time.Now().Add(-24 * time.Hour).Unix()
 
 	err = x.
-		Select("action.*, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
+		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
 		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
 		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
 		Join("LEFT", "repository", "action.repo_id = repository.id").
@@ -376,7 +376,7 @@ func GetRecentlyPushedBranches(user *User) (actions []*Action, err error) {
 			builder.Gte{"action.created_unix": limit},
 		)).
 		Limit(10).
-		GroupBy("clean_ref_name").
+		GroupBy("action.ref_name, action.repo_id, clean_ref_name").
 		Desc("action.id").
 		Find(&actions)
 	if err != nil {

From 6d9e242aeaaaff9d6c37feb7ed876018b8231d49 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 15 Dec 2020 23:15:44 +0100
Subject: [PATCH 07/30] Add the actual message

---
 options/locale/locale_en-US.ini              |  2 ++
 templates/user/dashboard/dashboard.tmpl      |  2 +-
 templates/user/recently_pushed_branches.tmpl | 12 +++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 63a768dc737d9..35ad8248b6762 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1304,6 +1304,8 @@ pulls.merge_instruction_hint = `You can also view <a class="show-instruction">co
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
 
+pulls.recently_pushed_to_branches = You recently pushed to <strong>%[1]s/%[2]s</strong> on branch <strong>%[3]s</strong>
+
 milestones.new = New Milestone
 milestones.open_tab = %d Open
 milestones.close_tab = %d Closed
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 82b415a0b5f67..3ad809fa85e02 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -2,10 +2,10 @@
 <div class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
-		{{template "user/recently_pushed_branches" .}}
 		{{template "base/alert" .}}
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui container ten wide column">
+				{{template "user/recently_pushed_branches" .}}
 				{{template "user/heatmap" .}}
 				{{template "user/dashboard/feeds" .}}
 			</div>
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 44eb083a962e8..5ff4b49c678fa 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,10 +1,8 @@
 {{range .RecentlyPushedBranches}}
-    <p>
-        You recently pushed to {{.Repo.Owner.Name}}/{{.Repo.LowerName}} on branch {{.RefName}}
-    	<a href="/{{.Repo.Owner.Name}}/{{.Repo.LowerName}}/compare/{{.Repo.DefaultBranch | EscapePound}}...{{if .Repo.IsFork}}{{.Repo.Owner.Name}}:{{end}}{{.RefName | EscapePound}}">
-    		<button id="new-pull-request" class="ui compact basic button">
-                {{$.i18n.Tr "repo.pulls.compare_changes"}}
-            </button>
+    <div class="ui blue message">
+        {{$.i18n.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName | Safe}}
+    	<a class="ui compact blue button" href="/{{.Repo.Owner.Name}}/{{.Repo.LowerName}}/compare/{{.Repo.DefaultBranch | EscapePound}}...{{if .Repo.IsFork}}{{.Repo.Owner.Name}}:{{end}}{{.RefName | EscapePound}}">
+            {{$.i18n.Tr "repo.pulls.compare_changes"}}
     	</a>
-    </p>
+    </div>
 {{end}}
\ No newline at end of file

From 3f6b98940c3cd4e56280ed2e1e5f89d03bdde199 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 15:40:02 +0200
Subject: [PATCH 08/30] chore: move code to get the recently pushed branches

---
 models/recently_pushed.go | 78 +++++++++++++++++++++++++++++++++++++++
 routers/web/user/home.go  |  3 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 models/recently_pushed.go

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
new file mode 100644
index 0000000000000..085ba78ecc9e0
--- /dev/null
+++ b/models/recently_pushed.go
@@ -0,0 +1,78 @@
+package models
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"code.gitea.io/gitea/models/activities"
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/user"
+
+	"xorm.io/builder"
+)
+
+// GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
+func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (actions []*activities.Action, err error) {
+
+	limit := time.Now().Add(-24 * time.Hour).Unix()
+
+	err = db.GetEngine(ctx).
+		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
+		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
+		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
+		Join("LEFT", "repository", "action.repo_id = repository.id").
+		Where(builder.And(
+			builder.Eq{"action.op_type": activities.ActionCommitRepo},
+			builder.Eq{"action.act_user_id": u.ID},
+			builder.Or(
+				builder.Expr("repository.default_branch != clean_ref_name"),
+				builder.Eq{"repository.is_fork": true},
+			),
+			builder.Or(
+				builder.IsNull{"pull_request.id"},
+				builder.And(
+					builder.Eq{"pull_request.has_merged": false},
+					builder.Eq{"issue.is_closed": true},
+					builder.Gt{"action.created_unix": "issue.closed_unix"},
+				),
+			),
+			builder.Gte{"action.created_unix": limit},
+		)).
+		Limit(10).
+		GroupBy("action.ref_name, action.repo_id, clean_ref_name").
+		Desc("action.id").
+		Find(&actions)
+	if err != nil {
+		return nil, err
+	}
+
+	repoIDs := []int64{}
+	for _, a := range actions {
+		repoIDs = append(repoIDs, a.RepoID)
+	}
+
+	repos := make(map[int64]*repo.Repository, len(repoIDs))
+	err = db.GetEngine(ctx).In("id", repoIDs).Find(&repos)
+	if err != nil {
+		return nil, err
+	}
+
+	owners := make(map[int64]*user.User)
+	err = db.GetEngine(ctx).
+		In("repository.id", repoIDs).
+		Join("LEFT", "repository", "repository.owner_id = u.id").
+		Find(&owners)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range actions {
+		a.Repo = repos[a.RepoID]
+		a.Repo.Owner = owners[a.Repo.OwnerID]
+		a.RefName = strings.Replace(a.RefName, "refs/heads/", "", 1)
+	}
+
+	return
+}
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index 50a01f77a2467..b85535ad4f7c0 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
@@ -123,7 +124,7 @@ func Dashboard(ctx *context.Context) {
 		},
 	})
 
-	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctxUser)
+	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctxUser)
 	if err != nil {
 		ctx.ServerError("GetRecentlyPushedBranches", err)
 		return

From 1e136890a063348b8f4594a8aa16d517383cbade Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 15:40:26 +0200
Subject: [PATCH 09/30] feat: limit to max 3 recently pushed

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 085ba78ecc9e0..1b9a32fb0c99b 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -40,7 +40,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (actions []*ac
 			),
 			builder.Gte{"action.created_unix": limit},
 		)).
-		Limit(10).
+		Limit(3).
 		GroupBy("action.ref_name, action.repo_id, clean_ref_name").
 		Desc("action.id").
 		Find(&actions)

From a92a6d2924a395c743b8b844a7bf0ea3145ea599 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 15:58:14 +0200
Subject: [PATCH 10/30] fix: u.id after rename

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 1b9a32fb0c99b..375bd115b0596 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -62,7 +62,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (actions []*ac
 	owners := make(map[int64]*user.User)
 	err = db.GetEngine(ctx).
 		In("repository.id", repoIDs).
-		Join("LEFT", "repository", "repository.owner_id = u.id").
+		Join("LEFT", "repository", "repository.owner_id = user.id").
 		Find(&owners)
 	if err != nil {
 		return nil, err

From b80c8ac553c274de47b2cf8382a329b520a6d55e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 15:58:33 +0200
Subject: [PATCH 11/30] chore: use CompareLink template function to build PR
 link

---
 templates/user/recently_pushed_branches.tmpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 5ff4b49c678fa..53c1c56ba3740 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,8 +1,8 @@
 {{range .RecentlyPushedBranches}}
-    <div class="ui blue message">
-        {{$.i18n.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName | Safe}}
-    	<a class="ui compact blue button" href="/{{.Repo.Owner.Name}}/{{.Repo.LowerName}}/compare/{{.Repo.DefaultBranch | EscapePound}}...{{if .Repo.IsFork}}{{.Repo.Owner.Name}}:{{end}}{{.RefName | EscapePound}}">
-            {{$.i18n.Tr "repo.pulls.compare_changes"}}
-    	</a>
-    </div>
-{{end}}
\ No newline at end of file
+  <div class="ui blue message">
+  	{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName | Safe}}
+  	<a class="ui compact blue button" href="{{CompareLink .Repo .Repo .RefName}}">
+  		{{$.locale.Tr "repo.pulls.compare_changes"}}
+  	</a>
+  </div>
+{{end}}

From 50b52b4b92e1783bbfa1e8a759bdc049dcd31f9f Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 16:26:31 +0200
Subject: [PATCH 12/30] feat: check if the push was to a fork and change the
 link accordingly

---
 models/recently_pushed.go                    | 47 +++++++++++++++++---
 templates/user/recently_pushed_branches.tmpl |  2 +-
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 375bd115b0596..1d06f7414cdc2 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -13,11 +13,18 @@ import (
 	"xorm.io/builder"
 )
 
+type RecentlyPushedBranches struct {
+	Repo     *repo.Repository
+	BaseRepo *repo.Repository
+	RefName  string
+}
+
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
-func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (actions []*activities.Action, err error) {
+func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushedBranches []*RecentlyPushedBranches, err error) {
 
 	limit := time.Now().Add(-24 * time.Hour).Unix()
 
+	actions := []*activities.Action{}
 	err = db.GetEngine(ctx).
 		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
 		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
@@ -54,24 +61,52 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (actions []*ac
 	}
 
 	repos := make(map[int64]*repo.Repository, len(repoIDs))
-	err = db.GetEngine(ctx).In("id", repoIDs).Find(&repos)
+	err = db.GetEngine(ctx).
+		Where(builder.Or(
+			builder.In("repository.id", repoIDs),
+			builder.In("repository.id",
+				builder.Select("repository.fork_id").
+					From("repository").
+					Where(builder.In("repository.id", repoIDs)),
+			),
+		)).
+		Find(&repos)
 	if err != nil {
 		return nil, err
 	}
 
 	owners := make(map[int64]*user.User)
 	err = db.GetEngine(ctx).
-		In("repository.id", repoIDs).
+		Where(builder.Or(
+			builder.In("repository.id", repoIDs),
+			builder.In("repository.id",
+				builder.Select("repository.fork_id").
+					From("repository").
+					Where(builder.In("repository.id", repoIDs)),
+			),
+		)).
 		Join("LEFT", "repository", "repository.owner_id = user.id").
 		Find(&owners)
 	if err != nil {
 		return nil, err
 	}
 
+	recentlyPushedBranches = []*RecentlyPushedBranches{}
 	for _, a := range actions {
-		a.Repo = repos[a.RepoID]
-		a.Repo.Owner = owners[a.Repo.OwnerID]
-		a.RefName = strings.Replace(a.RefName, "refs/heads/", "", 1)
+		pushed := &RecentlyPushedBranches{
+			Repo:     repos[a.RepoID],
+			BaseRepo: repos[a.RepoID],
+			RefName:  strings.Replace(a.RefName, "refs/heads/", "", 1),
+		}
+
+		if pushed.Repo.IsFork {
+			pushed.BaseRepo = repos[pushed.Repo.ForkID]
+			pushed.BaseRepo.Owner = owners[pushed.BaseRepo.OwnerID]
+		}
+
+		pushed.Repo.Owner = owners[pushed.Repo.OwnerID]
+
+		recentlyPushedBranches = append(recentlyPushedBranches, pushed)
 	}
 
 	return
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 53c1c56ba3740..989ae5efcfa93 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,7 +1,7 @@
 {{range .RecentlyPushedBranches}}
   <div class="ui blue message">
   	{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName | Safe}}
-  	<a class="ui compact blue button" href="{{CompareLink .Repo .Repo .RefName}}">
+  	<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
   		{{$.locale.Tr "repo.pulls.compare_changes"}}
   	</a>
   </div>

From 05091d45651342c07f1cce899dee408d1a9975e0 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 16:30:52 +0200
Subject: [PATCH 13/30] feat: show time when the push happened

---
 models/recently_pushed.go                    | 4 +++-
 options/locale/locale_en-US.ini              | 2 +-
 templates/user/recently_pushed_branches.tmpl | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 1d06f7414cdc2..0d00107068a2c 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -17,6 +17,7 @@ type RecentlyPushedBranches struct {
 	Repo     *repo.Repository
 	BaseRepo *repo.Repository
 	RefName  string
+	Time     time.Time
 }
 
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
@@ -26,7 +27,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 
 	actions := []*activities.Action{}
 	err = db.GetEngine(ctx).
-		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name").
+		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name, action.created_unix").
 		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
 		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
 		Join("LEFT", "repository", "action.repo_id = repository.id").
@@ -97,6 +98,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 			Repo:     repos[a.RepoID],
 			BaseRepo: repos[a.RepoID],
 			RefName:  strings.Replace(a.RefName, "refs/heads/", "", 1),
+			Time:     a.GetCreate(),
 		}
 
 		if pushed.Repo.IsFork {
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1136f60cdab88..f7511e62cb57c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1684,7 +1684,7 @@ pulls.auto_merge_canceled_schedule_comment = `canceled auto merging this pull re
 pulls.delete.title = Delete this pull request?
 pulls.delete.text = Do you really want to delete this pull request? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived)
 
-pulls.recently_pushed_to_branches = You recently pushed to <strong>%[1]s/%[2]s</strong> on branch <strong>%[3]s</strong>
+pulls.recently_pushed_to_branches = You pushed to <strong>%[1]s/%[2]s</strong> on branch <strong>%[3]s</strong> %[4]s
 
 milestones.new = New Milestone
 milestones.closed = Closed %s
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 989ae5efcfa93..fc0ea8d558895 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,6 +1,7 @@
 {{range .RecentlyPushedBranches}}
   <div class="ui blue message">
-  	{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName | Safe}}
+		{{$timeSince := TimeSince .Time $.locale}}
+  	{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
   	<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
   		{{$.locale.Tr "repo.pulls.compare_changes"}}
   	</a>

From 63df5c615ddcd3bec01048954f6f8b525818f5c1 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 16:49:57 +0200
Subject: [PATCH 14/30] fix: lint

---
 models/recently_pushed.go                    |  6 ++++--
 routers/web/user/home.go                     |  7 +++----
 templates/user/recently_pushed_branches.tmpl | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 0d00107068a2c..96d2b0cb2e823 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -1,3 +1,6 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package models
 
 import (
@@ -22,7 +25,6 @@ type RecentlyPushedBranches struct {
 
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
 func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushedBranches []*RecentlyPushedBranches, err error) {
-
 	limit := time.Now().Add(-24 * time.Hour).Unix()
 
 	actions := []*activities.Action{}
@@ -111,5 +113,5 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 		recentlyPushedBranches = append(recentlyPushedBranches, pushed)
 	}
 
-	return
+	return recentlyPushedBranches, nil
 }
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index b85535ad4f7c0..95788d067e77d 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -123,15 +123,14 @@ func Dashboard(ctx *context.Context) {
 			PageSize: setting.UI.FeedPagingNum,
 		},
 	})
-
-	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctxUser)
 	if err != nil {
-		ctx.ServerError("GetRecentlyPushedBranches", err)
+		ctx.ServerError("GetFeeds", err)
 		return
 	}
 
+	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctxUser)
 	if err != nil {
-		ctx.ServerError("GetFeeds", err)
+		ctx.ServerError("GetRecentlyPushedBranches", err)
 		return
 	}
 
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index fc0ea8d558895..3c2b62c6c9e55 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,9 +1,9 @@
 {{range .RecentlyPushedBranches}}
-  <div class="ui blue message">
+	<div class="ui blue message">
 		{{$timeSince := TimeSince .Time $.locale}}
-  	{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
-  	<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
-  		{{$.locale.Tr "repo.pulls.compare_changes"}}
-  	</a>
-  </div>
+		{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
+		<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
+			{{$.locale.Tr "repo.pulls.compare_changes"}}
+		</a>
+	</div>
 {{end}}

From d193b0be09ea510ef0b76686f118f8a9aa179647 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 21:07:51 +0200
Subject: [PATCH 15/30] fix: group by statement

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 96d2b0cb2e823..081eef8aebf25 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -51,7 +51,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 			builder.Gte{"action.created_unix": limit},
 		)).
 		Limit(3).
-		GroupBy("action.ref_name, action.repo_id, clean_ref_name").
+		GroupBy("action.ref_name, action.repo_id, action.created_unix").
 		Desc("action.id").
 		Find(&actions)
 	if err != nil {

From 1f32d431abdbe773c0f99fe40b0ab49bd01e9d0c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 21:22:18 +0200
Subject: [PATCH 16/30] feat: always align the create PR button to the right

---
 templates/user/recently_pushed_branches.tmpl | 16 ++++++++++------
 web_src/css/home.css                         |  9 +++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 3c2b62c6c9e55..0d06ddbb954dc 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,9 +1,13 @@
 {{range .RecentlyPushedBranches}}
-	<div class="ui blue message">
-		{{$timeSince := TimeSince .Time $.locale}}
-		{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
-		<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
-			{{$.locale.Tr "repo.pulls.compare_changes"}}
-		</a>
+	<div class="ui blue message grid recently-pushed-branches">
+		<div class="twelve wide column">
+			{{$timeSince := TimeSince .Time $.locale}}
+			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
+		</div>
+		<div class="four wide column">
+			<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
+				{{$.locale.Tr "repo.pulls.compare_changes"}}
+			</a>
+		</div>
 	</div>
 {{end}}
diff --git a/web_src/css/home.css b/web_src/css/home.css
index 5d36da594cc9f..e699c607eaeff 100644
--- a/web_src/css/home.css
+++ b/web_src/css/home.css
@@ -51,3 +51,12 @@
     float: none;
   }
 }
+
+.ui.message.recently-pushed-branches {
+  align-items: center;
+  padding: 0;
+}
+
+.ui.message.recently-pushed-branches .button {
+  margin: 0;
+}

From 924384e7515ef7908fe19a518ca0f2ee24f4b65b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 21:28:37 +0200
Subject: [PATCH 17/30] fix: don't use alias for clean_ref_name

---
 models/recently_pushed.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 081eef8aebf25..18ac9734d3dcb 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -29,15 +29,15 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 
 	actions := []*activities.Action{}
 	err = db.GetEngine(ctx).
-		Select("action.ref_name, action.repo_id, replace(action.ref_name, 'refs/heads/', '') AS clean_ref_name, action.created_unix").
-		Join("LEFT", "pull_request", "pull_request.head_branch = clean_ref_name").
+		Select("action.ref_name, action.repo_id, action.created_unix").
+		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
 		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
 		Join("LEFT", "repository", "action.repo_id = repository.id").
 		Where(builder.And(
 			builder.Eq{"action.op_type": activities.ActionCommitRepo},
 			builder.Eq{"action.act_user_id": u.ID},
 			builder.Or(
-				builder.Expr("repository.default_branch != clean_ref_name"),
+				builder.Expr("repository.default_branch != replace(action.ref_name, 'refs/heads/', '')"),
 				builder.Eq{"repository.is_fork": true},
 			),
 			builder.Or(

From 63c1767c60fd790242585b912977866f79f6032e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 22:05:07 +0200
Subject: [PATCH 18/30] fix: sort by

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 18ac9734d3dcb..3c7a39877bfcb 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -52,7 +52,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 		)).
 		Limit(3).
 		GroupBy("action.ref_name, action.repo_id, action.created_unix").
-		Desc("action.id").
+		Desc("action.created_unix").
 		Find(&actions)
 	if err != nil {
 		return nil, err

From ab60ee04911f670a09c069f226e2812e8c2beaed Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 1 Apr 2023 22:10:26 +0200
Subject: [PATCH 19/30] chore: add some comments

---
 models/recently_pushed.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 3c7a39877bfcb..f1896c3f7bda8 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -28,6 +28,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 	limit := time.Now().Add(-24 * time.Hour).Unix()
 
 	actions := []*activities.Action{}
+	// We're fetching the last three commits activity actions within the limit...
 	err = db.GetEngine(ctx).
 		Select("action.ref_name, action.repo_id, action.created_unix").
 		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
@@ -35,11 +36,14 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 		Join("LEFT", "repository", "action.repo_id = repository.id").
 		Where(builder.And(
 			builder.Eq{"action.op_type": activities.ActionCommitRepo},
+			// ...done by the current user
 			builder.Eq{"action.act_user_id": u.ID},
+			// ...which have been pushed to a fork or a branch different from the default branch
 			builder.Or(
 				builder.Expr("repository.default_branch != replace(action.ref_name, 'refs/heads/', '')"),
 				builder.Eq{"repository.is_fork": true},
 			),
+			// ...and don't have an open or closed PR corresponding to that branch.
 			builder.Or(
 				builder.IsNull{"pull_request.id"},
 				builder.And(
@@ -63,6 +67,8 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 		repoIDs = append(repoIDs, a.RepoID)
 	}
 
+	// Because we need the repo name and url, we need to fetch all repos from recent pushes
+	// and, if they are forked, the parent repo as well.
 	repos := make(map[int64]*repo.Repository, len(repoIDs))
 	err = db.GetEngine(ctx).
 		Where(builder.Or(

From ef9985d01a704801bd6947a342bcb14a60846aa8 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 14:34:04 +0200
Subject: [PATCH 20/30] fix: use builder expression instead of builder.Gt

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index f1896c3f7bda8..6c12b2c8e0a0f 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -49,7 +49,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 				builder.And(
 					builder.Eq{"pull_request.has_merged": false},
 					builder.Eq{"issue.is_closed": true},
-					builder.Gt{"action.created_unix": "issue.closed_unix"},
+					builder.Expr("action.created_unix > issue.closed_unix"),
 				),
 			),
 			builder.Gte{"action.created_unix": limit},

From 263c9f6f16520be1b07515612e17ddba1b04adc7 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 15:09:16 +0200
Subject: [PATCH 21/30] fix: escape user table

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index 6c12b2c8e0a0f..d9ccf38a1468e 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -94,7 +94,7 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 					Where(builder.In("repository.id", repoIDs)),
 			),
 		)).
-		Join("LEFT", "repository", "repository.owner_id = user.id").
+		Join("LEFT", "repository", "`repository`.owner_id = `user`.id").
 		Find(&owners)
 	if err != nil {
 		return nil, err

From f4f54a93306907ca4c62f0cdcda68fa66d258911 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 15:13:21 +0200
Subject: [PATCH 22/30] chore: use a more positive attitude towards messages

---
 templates/user/recently_pushed_branches.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 0d06ddbb954dc..c860c3910fcbf 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,11 +1,11 @@
 {{range .RecentlyPushedBranches}}
-	<div class="ui blue message grid recently-pushed-branches">
+	<div class="ui positive message grid recently-pushed-branches">
 		<div class="twelve wide column">
 			{{$timeSince := TimeSince .Time $.locale}}
 			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
 		</div>
 		<div class="four wide column">
-			<a class="ui compact blue button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
+			<a class="ui compact positive button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
 				{{$.locale.Tr "repo.pulls.compare_changes"}}
 			</a>
 		</div>

From 429dda079128defd7fd9cbb9f7a8c6df9b68c790 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 18:14:28 +0200
Subject: [PATCH 23/30] chore: use helper classes instead of custom css

---
 templates/user/recently_pushed_branches.tmpl | 4 ++--
 web_src/css/home.css                         | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index c860c3910fcbf..51fa35c0b9935 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,11 +1,11 @@
 {{range .RecentlyPushedBranches}}
-	<div class="ui positive message grid recently-pushed-branches">
+	<div class="ui positive message grid gt-p-0 gt-ac">
 		<div class="twelve wide column">
 			{{$timeSince := TimeSince .Time $.locale}}
 			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
 		</div>
 		<div class="four wide column">
-			<a class="ui compact positive button" href="{{CompareLink .BaseRepo .Repo .RefName}}">
+			<a class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .RefName}}">
 				{{$.locale.Tr "repo.pulls.compare_changes"}}
 			</a>
 		</div>
diff --git a/web_src/css/home.css b/web_src/css/home.css
index e699c607eaeff..5d36da594cc9f 100644
--- a/web_src/css/home.css
+++ b/web_src/css/home.css
@@ -51,12 +51,3 @@
     float: none;
   }
 }
-
-.ui.message.recently-pushed-branches {
-  align-items: center;
-  padding: 0;
-}
-
-.ui.message.recently-pushed-branches .button {
-  margin: 0;
-}

From e41a255687b36d8756c6e459443a66f155ea7f6a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 18:17:44 +0200
Subject: [PATCH 24/30] fix: rename RefName to BranchName because that's what
 it is

---
 models/recently_pushed.go                    | 16 ++++++++--------
 templates/user/recently_pushed_branches.tmpl |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index d9ccf38a1468e..c4c4b749247f2 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -17,10 +17,10 @@ import (
 )
 
 type RecentlyPushedBranches struct {
-	Repo     *repo.Repository
-	BaseRepo *repo.Repository
-	RefName  string
-	Time     time.Time
+	Repo       *repo.Repository
+	BaseRepo   *repo.Repository
+	BranchName string
+	Time       time.Time
 }
 
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
@@ -103,10 +103,10 @@ func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushe
 	recentlyPushedBranches = []*RecentlyPushedBranches{}
 	for _, a := range actions {
 		pushed := &RecentlyPushedBranches{
-			Repo:     repos[a.RepoID],
-			BaseRepo: repos[a.RepoID],
-			RefName:  strings.Replace(a.RefName, "refs/heads/", "", 1),
-			Time:     a.GetCreate(),
+			Repo:       repos[a.RepoID],
+			BaseRepo:   repos[a.RepoID],
+			BranchName: strings.Replace(a.RefName, "refs/heads/", "", 1),
+			Time:       a.GetCreate(),
 		}
 
 		if pushed.Repo.IsFork {
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 51fa35c0b9935..f451ef8d6d625 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -2,10 +2,10 @@
 	<div class="ui positive message grid gt-p-0 gt-ac">
 		<div class="twelve wide column">
 			{{$timeSince := TimeSince .Time $.locale}}
-			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .RefName $timeSince | Safe}}
+			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}
 		</div>
 		<div class="four wide column">
-			<a class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .RefName}}">
+			<a class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .BranchName}}">
 				{{$.locale.Tr "repo.pulls.compare_changes"}}
 			</a>
 		</div>

From 2708a903aa464ba242f4b82b16828a5eb027d897 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 3 Apr 2023 13:25:34 +0200
Subject: [PATCH 25/30] feat: only show commits in the last two hours

---
 models/recently_pushed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/recently_pushed.go b/models/recently_pushed.go
index c4c4b749247f2..5847d7913a002 100644
--- a/models/recently_pushed.go
+++ b/models/recently_pushed.go
@@ -25,7 +25,7 @@ type RecentlyPushedBranches struct {
 
 // GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
 func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushedBranches []*RecentlyPushedBranches, err error) {
-	limit := time.Now().Add(-24 * time.Hour).Unix()
+	limit := time.Now().Add(-2 * time.Hour).Unix()
 
 	actions := []*activities.Action{}
 	// We're fetching the last three commits activity actions within the limit...

From 0608deee59df7287a85d7c7b2243a0eabbb5056b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 3 Apr 2023 13:37:43 +0200
Subject: [PATCH 26/30] feat: show the pull request message in repo code, issue
 and PR pages

---
 routers/web/repo/issue.go                    | 9 +++++++++
 routers/web/repo/view.go                     | 9 +++++++++
 templates/repo/home.tmpl                     | 1 +
 templates/repo/issue/list.tmpl               | 1 +
 templates/user/recently_pushed_branches.tmpl | 2 +-
 web_src/css/helpers.css                      | 1 +
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 612222598f2fa..fc6f9c5f597f5 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
@@ -456,6 +457,14 @@ func Issues(ctx *context.Context) {
 
 	ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
 
+	if ctx.Doer != nil {
+		ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctx.Doer)
+		if err != nil {
+			ctx.ServerError("GetRecentlyPushedBranches", err)
+			return
+		}
+	}
+
 	ctx.HTML(http.StatusOK, tplIssues)
 }
 
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index ce60d91150281..911a9e759a647 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	admin_model "code.gitea.io/gitea/models/admin"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
@@ -958,6 +959,14 @@ func renderCode(ctx *context.Context) {
 		}
 	}
 
+	if ctx.Doer != nil {
+		ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctx.Doer)
+		if err != nil {
+			ctx.ServerError("GetRecentlyPushedBranches", err)
+			return
+		}
+	}
+
 	ctx.Data["Paths"] = paths
 	ctx.Data["TreeLink"] = treeLink
 	ctx.Data["TreeNames"] = treeNames
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index e544b7aab59e2..2265c2257ec19 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,6 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
+		{{template "user/recently_pushed_branches" .}}
 		{{if and (not .HideRepoInfo) (not .IsBlame)}}
 		<div class="ui repo-description">
 			<div id="repo-desc">
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index cfc9a930484f1..9f747d3b37a68 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -2,6 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
+		{{template "user/recently_pushed_branches" .}}
 		<div class="ui three column grid issue-list-headers">
 			<div class="column">
 				{{template "repo/issue/navbar" .}}
diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index f451ef8d6d625..cda9645fa747e 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -4,7 +4,7 @@
 			{{$timeSince := TimeSince .Time $.locale}}
 			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}
 		</div>
-		<div class="four wide column">
+		<div class="four wide column gt-tr">
 			<a class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .BranchName}}">
 				{{$.locale.Tr "repo.pulls.compare_changes"}}
 			</a>
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
index e2d195822fc0f..3ce89990c287d 100644
--- a/web_src/css/helpers.css
+++ b/web_src/css/helpers.css
@@ -6,6 +6,7 @@
 .gt-ab { align-items: baseline !important; }
 .gt-tc { text-align: center !important; }
 .gt-tl { text-align: left !important; }
+.gt-tr { text-align: right !important; }
 .gt-tdn { text-decoration: none !important; }
 .gt-jc { justify-content: center !important; }
 .gt-js { justify-content: flex-start !important; }

From 3d5a5f5d51ccca5ad7dc62d91d81e452bc83225b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 3 Apr 2023 13:58:08 +0200
Subject: [PATCH 27/30] chore: use flexbox instead of foomatic grid

---
 templates/user/recently_pushed_branches.tmpl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index cda9645fa747e..2c1350ce44512 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,13 +1,11 @@
 {{range .RecentlyPushedBranches}}
-	<div class="ui positive message grid gt-p-0 gt-ac">
-		<div class="twelve wide column">
+	<div class="ui positive message gt-p-4 gt-df gt-ac">
+		<div class="gt-f1">
 			{{$timeSince := TimeSince .Time $.locale}}
 			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}
 		</div>
-		<div class="four wide column gt-tr">
-			<a class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .BranchName}}">
-				{{$.locale.Tr "repo.pulls.compare_changes"}}
-			</a>
-		</div>
+		<a aria-role="button" class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .BranchName}}">
+			{{$.locale.Tr "repo.pulls.compare_changes"}}
+		</a>
 	</div>
 {{end}}

From 97879169a663f1c4422780635097ed8ebd55eb1a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 3 Apr 2023 14:37:51 +0200
Subject: [PATCH 28/30] fix: left align text

---
 templates/user/recently_pushed_branches.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/recently_pushed_branches.tmpl b/templates/user/recently_pushed_branches.tmpl
index 2c1350ce44512..598c0ebfd847c 100644
--- a/templates/user/recently_pushed_branches.tmpl
+++ b/templates/user/recently_pushed_branches.tmpl
@@ -1,5 +1,5 @@
 {{range .RecentlyPushedBranches}}
-	<div class="ui positive message gt-p-4 gt-df gt-ac">
+	<div class="ui positive message gt-p-4 gt-df gt-ac gt-tl">
 		<div class="gt-f1">
 			{{$timeSince := TimeSince .Time $.locale}}
 			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}

From b013b53429f41171998d347634549af5d622eb41 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 4 Apr 2023 11:49:14 +0200
Subject: [PATCH 29/30] fix: change test to only check for partial equality

---
 tests/integration/repo_branch_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go
index c56aa43c514bc..91674ddc82dba 100644
--- a/tests/integration/repo_branch_test.go
+++ b/tests/integration/repo_branch_test.go
@@ -120,9 +120,9 @@ func testCreateBranches(t *testing.T, giteaURL *url.URL) {
 			req := NewRequest(t, "GET", redirectURL)
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
-			assert.Equal(t,
-				test.FlashMessage,
+			assert.Contains(t,
 				strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()),
+				test.FlashMessage,
 			)
 		}
 	}

From 39e6f436073747a9bb92a2fb7704df4c05d65f51 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 4 Apr 2023 17:26:36 +0200
Subject: [PATCH 30/30] Trigger build