+
{{if not .Runs}}
{{svg "octicon-no-entry" 48}}
@@ -28,14 +28,14 @@
-
-
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}
-
{{svg "octicon-stopwatch" 16}}{{.Duration}}
+
+
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}
+
{{svg "octicon-stopwatch" 16}}{{.Duration}}
+
{{end}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 46f82c47d4d5a..d52e5a047ab26 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -15,7 +15,7 @@
{{range $i, $v := .TreeNames}}
/
{{if eq $i $l}}
-
+
{{svg "octicon-info"}}
{{else}}
{{$v}}
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl
index 0a7c49dae3d16..572502040678a 100644
--- a/templates/repo/editor/upload.tmpl
+++ b/templates/repo/editor/upload.tmpl
@@ -13,7 +13,7 @@
{{range $i, $v := .TreeNames}}
/
{{if eq $i $l}}
-
+
{{svg "octicon-info"}}
{{else}}
{{$v}}
diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go
index 029ea65d7190f..609bd73fd514c 100644
--- a/tests/integration/pull_create_test.go
+++ b/tests/integration/pull_create_test.go
@@ -4,6 +4,7 @@
package integration
import (
+ "fmt"
"net/http"
"net/http/httptest"
"net/url"
@@ -57,6 +58,30 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSel
return resp
}
+func testPullCreateDirectly(t *testing.T, session *TestSession, baseRepoOwner, baseRepoName, baseBranch, headRepoOwner, headRepoName, headBranch, title string) *httptest.ResponseRecorder {
+ headCompare := headBranch
+ if headRepoOwner != "" {
+ if headRepoName != "" {
+ headCompare = fmt.Sprintf("%s/%s:%s", headRepoOwner, headRepoName, headBranch)
+ } else {
+ headCompare = fmt.Sprintf("%s:%s", headRepoOwner, headBranch)
+ }
+ }
+ req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/compare/%s...%s", baseRepoOwner, baseRepoName, baseBranch, headCompare))
+ resp := session.MakeRequest(t, req, http.StatusOK)
+
+ // Submit the form for creating the pull
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+ assert.True(t, exists, "The template has changed")
+ req = NewRequestWithValues(t, "POST", link, map[string]string{
+ "_csrf": htmlDoc.GetCSRF(),
+ "title": title,
+ })
+ resp = session.MakeRequest(t, req, http.StatusOK)
+ return resp
+}
+
func TestPullCreate(t *testing.T) {
onGiteaRun(t, func(t *testing.T, u *url.URL) {
session := loginUser(t, "user1")
diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go
index 9a5877697c0ba..2d8b3cb4ab2e9 100644
--- a/tests/integration/pull_review_test.go
+++ b/tests/integration/pull_review_test.go
@@ -161,10 +161,18 @@ func TestPullView_CodeOwner(t *testing.T) {
assert.NoError(t, err)
session := loginUser(t, "user5")
- testPullCreate(t, session, "user5", "test_codeowner", true, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2")
+
+ // create a pull request on the forked repository, code reviewers should not be mentioned
+ testPullCreateDirectly(t, session, "user5", "test_codeowner", forkedRepo.DefaultBranch, "", "", "codeowner-basebranch-forked", "Test Pull Request on Forked Repository")
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
+
+ // create a pull request to base repository, code reviewers should be mentioned
+ testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkedRepo.OwnerName, forkedRepo.Name, "codeowner-basebranch-forked", "Test Pull Request3")
+
+ pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
+ unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
})
})
}
diff --git a/web_src/css/actions.css b/web_src/css/actions.css
index 1d5bea2395e5c..0ab09f537abce 100644
--- a/web_src/css/actions.css
+++ b/web_src/css/actions.css
@@ -44,9 +44,10 @@
}
.run-list-item-right {
- flex: 0 0 min(20%, 130px);
+ width: 130px;
display: flex;
flex-direction: column;
+ flex-shrink: 0;
gap: 3px;
color: var(--color-text-light);
}
@@ -57,3 +58,26 @@
gap: .25rem;
align-items: center;
}
+
+.run-list .flex-item-trailing {
+ flex-wrap: nowrap;
+ width: 280px;
+ flex: 0 0 280px;
+}
+
+.run-list-ref {
+ display: inline-block !important;
+}
+
+@media (max-width: 767.98px) {
+ .run-list .flex-item-trailing {
+ flex-direction: column;
+ align-items: flex-end;
+ width: auto;
+ flex-basis: auto;
+ }
+ .run-list-item-right,
+ .run-list-ref {
+ max-width: 110px;
+ }
+}
diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css
index 47f55df7fa1db..87b9ddf292d0e 100644
--- a/web_src/css/modules/button.css
+++ b/web_src/css/modules/button.css
@@ -249,6 +249,7 @@
.ui.red.button,
.ui.red.buttons .button {
+ color: var(--color-white);
background: var(--color-red);
}
@@ -283,6 +284,7 @@
.ui.green.button,
.ui.green.buttons .button {
+ color: var(--color-white);
background: var(--color-green);
}
diff --git a/web_src/css/modules/menu.css b/web_src/css/modules/menu.css
index 2581d8fab2ae6..a392ffb5e9200 100644
--- a/web_src/css/modules/menu.css
+++ b/web_src/css/modules/menu.css
@@ -588,7 +588,6 @@
.ui.secondary.pointing.menu .dropdown.item:active,
.ui.secondary.pointing.menu a.item:active {
background-color: transparent;
- border-color: var(--color-secondary);
}
.ui.secondary.pointing.menu .active.item {
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 887789115ebbd..0f6bf482b5db5 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -1063,6 +1063,12 @@ td .commit-summary {
margin-left: 15px;
}
+.repository.view.issue .comment-list .event .detail .text {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
.repository.view.issue .comment-list .event .segments {
box-shadow: none;
}
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 06c42f0b35dae..16ce3fc80da4a 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -377,7 +377,7 @@ export function initRepositoryActionView() {
-