From 358ec8002e0c88fefb737af2f1b7c2a32d00afd1 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sun, 28 Jul 2024 02:29:58 +0200
Subject: [PATCH] [UI] Show AGit label on merged PR

- The label wasn't show on merged PRs.
- Integration test added
---
 templates/repo/issue/view_title.tmpl |  9 +++++++++
 tests/integration/git_test.go        | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index 7123f4c04..1a711fcb9 100644
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -69,6 +69,15 @@
 						<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a>
 						<span class="pull-desc">{{ctx.Locale.TrN .NumCommits "repo.pulls.merged_title_desc_one" "repo.pulls.merged_title_desc_few" .NumCommits $headHref $baseHref $mergedStr}}</span>
 					{{end}}
+					{{if .MadeUsingAGit}}
+						{{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}}
+						{{/* Note: #agit-label is necessary for testing whether the label appears when it should in tests/integration/git_test.go */}}
+						<a target="_blank" rel="noopener" href="https://forgejo.org/docs/latest/user/agit-support/">
+							<span id="agit-label" data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.agit_explanation"}}" class="ui small label">
+								{{ctx.Locale.Tr "repo.pulls.made_using_agit"}}
+							</span>
+						</a>
+					{{end}}
 				{{else}}
 					{{if .Issue.OriginalAuthor}}
 						<span id="pull-desc-display" class="pull-desc">{{.Issue.OriginalAuthor}} {{ctx.Locale.TrN .NumCommits "repo.pulls.title_desc_one" "repo.pulls.title_desc_few" .NumCommits $headHref $baseHref}}</span>
diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go
index b7469a04c..af6b825f0 100644
--- a/tests/integration/git_test.go
+++ b/tests/integration/git_test.go
@@ -1067,6 +1067,18 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 		})
 
 		t.Run("Merge", doAPIMergePullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index))
+
+		t.Run("AGitLabelIsPresent Merged", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, ctx.Username)
+
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), pr2.Index))
+			resp := session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			htmlDoc.AssertElement(t, "#agit-label", true)
+		})
+
 		t.Run("CheckoutMasterAgain", doGitCheckoutBranch(dstPath, "master"))
 	}
 }