diff --git a/templates/shared/user/authorlink.tmpl b/templates/shared/user/authorlink.tmpl
index d57a635b4b..abe1ab1ce2 100644
--- a/templates/shared/user/authorlink.tmpl
+++ b/templates/shared/user/authorlink.tmpl
@@ -1 +1 @@
-
{{.GetDisplayName}}{{if .IsBot}}
bot{{end}}
+
{{.GetDisplayName}}{{if .IsBot}}
bot{{end}}
diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go
index 62a7d18904..e8b38afeb1 100644
--- a/tests/integration/auth_ldap_test.go
+++ b/tests/integration/auth_ldap_test.go
@@ -283,7 +283,7 @@ func TestLDAPUserSyncWithEmptyUsernameAttribute(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
- tr := htmlDoc.doc.Find("table.table tbody tr")
+ tr := htmlDoc.doc.Find("table.table tbody tr:not(.no-results-row)")
assert.Equal(t, 0, tr.Length())
}
diff --git a/tests/integration/pull_editable_test.go b/tests/integration/pull_editable_test.go
new file mode 100644
index 0000000000..dfd634f0b5
--- /dev/null
+++ b/tests/integration/pull_editable_test.go
@@ -0,0 +1,54 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+ "net/http"
+ "net/url"
+ "testing"
+
+ auth_model "code.gitea.io/gitea/models/auth"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/tests"
+)
+
+func TestPullEditable_ShowEditableLabel(t *testing.T) {
+ onGiteaRun(t, func(t *testing.T, forgejoURL *url.URL) {
+ t.Run("Show editable label if PR is editable", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+ editable := true
+
+ setPREditable(t, editable)
+ testEditableLabelShown(t, editable)
+ })
+
+ t.Run("Don't show editable label if PR is not editable", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+ editable := false
+
+ setPREditable(t, editable)
+ testEditableLabelShown(t, editable)
+ })
+ })
+}
+
+func setPREditable(t *testing.T, editable bool) {
+ t.Helper()
+ session := loginUser(t, "user1")
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+
+ req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/pulls/3", &api.EditPullRequestOption{
+ AllowMaintainerEdit: &editable,
+ }).AddTokenAuth(token)
+ session.MakeRequest(t, req, http.StatusCreated)
+}
+
+func testEditableLabelShown(t *testing.T, expectLabel bool) {
+ t.Helper()
+ session := loginUser(t, "user2")
+ req := NewRequest(t, "GET", "/user2/repo1/pulls/3")
+ resp := session.MakeRequest(t, req, http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ htmlDoc.AssertElement(t, "#editable-label", expectLabel)
+}
diff --git a/tests/integration/user_redirect_test.go b/tests/integration/user_redirect_test.go
index fef0c7cb67..2235876859 100644
--- a/tests/integration/user_redirect_test.go
+++ b/tests/integration/user_redirect_test.go
@@ -167,7 +167,7 @@ func TestUserRedirect(t *testing.T) {
defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 8)()
defer tests.PrintCurrentTest(t)()
- assert.Contains(t, getPrompt(t), "The old username will be available to everyone after a cooldown period of 8 days, you can still reclaim the old username during the cooldown period.")
+ assert.Contains(t, getPrompt(t), "The old organization name will be available to everyone after a cooldown period of 8 days, you can still reclaim the old name during the cooldown period.")
})
})
}