loading up the forgejo repo on tangled to test page performance
Merge pull request '[UI] Show AGit label on merged PR' (#4715) from gusted/agit into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4715
Reviewed-by: Otto <otto@codeberg.org>
+21
+9
templates/repo/issue/view_title.tmpl
+9
templates/repo/issue/view_title.tmpl
···
69
69
<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a>
70
70
<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>
71
71
{{end}}
72
+
{{if .MadeUsingAGit}}
73
+
{{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}}
74
+
{{/* Note: #agit-label is necessary for testing whether the label appears when it should in tests/integration/git_test.go */}}
75
+
<a target="_blank" rel="noopener" href="https://forgejo.org/docs/latest/user/agit-support/">
76
+
<span id="agit-label" data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.agit_explanation"}}" class="ui small label">
77
+
{{ctx.Locale.Tr "repo.pulls.made_using_agit"}}
78
+
</span>
79
+
</a>
80
+
{{end}}
72
81
{{else}}
73
82
{{if .Issue.OriginalAuthor}}
74
83
<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>
+12
tests/integration/git_test.go
+12
tests/integration/git_test.go
···
1067
1067
})
1068
1068
1069
1069
t.Run("Merge", doAPIMergePullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index))
1070
+
1071
+
t.Run("AGitLabelIsPresent Merged", func(t *testing.T) {
1072
+
defer tests.PrintCurrentTest(t)()
1073
+
1074
+
session := loginUser(t, ctx.Username)
1075
+
1076
+
req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), pr2.Index))
1077
+
resp := session.MakeRequest(t, req, http.StatusOK)
1078
+
htmlDoc := NewHTMLParser(t, resp.Body)
1079
+
htmlDoc.AssertElement(t, "#agit-label", true)
1080
+
})
1081
+
1070
1082
t.Run("CheckoutMasterAgain", doGitCheckoutBranch(dstPath, "master"))
1071
1083
}
1072
1084
}