{{template "repo/header" .}}
+ {{template "user/recently_pushed_branches" .}}
{{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}}
-
+
{{$.locale.Tr "repo.pulls.compare_changes"}} 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 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}} -
-
+
+
{{$timeSince := TimeSince .Time $.locale}} {{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}
- + + {{$.locale.Tr "repo.pulls.compare_changes"}} +
{{end}} From 97879169a663f1c4422780635097ed8ebd55eb1a Mon Sep 17 00:00:00 2001 From: kolaente 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}} -
+
{{$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 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 Date: Tue, 4 Apr 2023 17:26:36 +0200 Subject: [PATCH 30/30] Trigger build