From b4e329ad1c79c3cfbb6de9d98e59c22cbeb63dfe Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Sun, 10 Aug 2025 22:19:25 +0200 Subject: [PATCH] [v12.0/forgejo] fix(ui): move file rename notice to before pagination (#8852) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/8818 Followup to https://codeberg.org/forgejo/forgejo/pulls/1442 Move the rename notice to a more suitable place. Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8852 Reviewed-by: Gusted Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- templates/repo/commits.tmpl | 5 ----- templates/repo/commits_table.tmpl | 6 ++++++ .../repo59.git/objects/info/commit-graph | Bin 1292 -> 1352 bytes .../user2/repo59.git/objects/info/packs | 2 +- ...c75cb726e1cc54d31c00c741912da8baa644a4.idx | Bin 0 -> 1548 bytes ...75cb726e1cc54d31c00c741912da8baa644a4.pack | Bin 0 -> 3999 bytes ...c75cb726e1cc54d31c00c741912da8baa644a4.rev | Bin 0 -> 120 bytes ...d3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx | Bin 1660 -> 0 bytes ...3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack | Bin 6316 -> 0 bytes ...d3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev | Bin 136 -> 0 bytes .../user2/repo59.git/packed-refs | 2 +- tests/integration/repo_test.go | 20 ++++++++++++++++++ 12 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx create mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack create mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev delete mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx delete mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack delete mode 100644 tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 86df88f6e3..e6efe1ff54 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -13,11 +13,6 @@ {{template "repo/commits_table" .}} - {{if .OldFilename}} -
- {{ctx.Locale.Tr "repo.commits.renamed_from" .OldFilename}} ({{ctx.Locale.Tr "repo.commits.browse_further"}}) -
- {{end}} {{template "base/footer" .}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 621fc44bf5..09af3e4229 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -37,4 +37,10 @@ {{template "repo/commits_list" .}} {{end}} +{{if .OldFilename}} +
+ {{ctx.Locale.Tr "repo.commits.renamed_from" .OldFilename}} ({{ctx.Locale.Tr "repo.commits.browse_further"}}) +
+{{end}} + {{template "base/paginate" .}} diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph index d151dc87e63b6d2485029740163c1cd02c7d41d0..f85243ea3fd2d2614f8e9743fcf16407815cadcb 100644 GIT binary patch delta 188 zcmeC-I>9wTTXKrKi=z<(7_h29Xb{P2veD%{vmpzRNfMsy!eS%x`LXCdgOwbCM>o|s zdD-~=u~{|KadHDoj>k;a)0s!SQeU|q-!FHh;Na$Pwe`DzHZT@|tYl!|$(Ux=2Vo+} ZZMHXJCHfd-zkT^;zAfWw<*i4?nlB0l-WMEj~-O{G< Tc)K`PiF1+U^e-||Q6V(|xv43sgH8Fdxtz#A1G+T6$qYpj{+k*0mY0Lwp(@O>!!Jxl_Wh zEvR~`k(g(>4f}7te!~TqdYrpi`BO~~9y2ZRIJzc8d!MGc9oF-fMmF zXJ){U^ZGN6REE}POEgx6g#B9ll&M9H!DGvks`ZjBYwae@jE!ku$@R_WSiRCUt|_{4 zzutGB%x>6W6Vs${c$FpFgT_xxi{(OQ@9Yxj$a7L^=K){#UH_+h-I&RGI`fEE>MPgd`{j-l z9NZkPwtm-wGwa`4a^!tg*q70E(=u+80Iy-)>PIW@{;dzu|1tZZWx`6$J3T9MW}a=I zzwLZ<^*;VRR(xN4+NS<}F)QrGSKHsl-_Cpyn`1JaJFcWu@L>1r&j;U_9eAD){nW4U zlY{B0Wu@D9IevaDde2}bN8r&-^-W$jet&FM&2-Ec2nhK7EB8ev@8PFMC64=_>Z(8C zymi^GMXN)fuyJJ<;q6NE`8vuUw+glEbYgk_`2+A?}dQH zLmDutp8zHuVA|o+0kS^;F)(hKt%3X}K=D!_Ed$ItbwKfSAUhR^n}J!i49K?yrUM?C u<1yRS9-axgEW>czaiZ>uUCUgS99VOBL6G&b`9jCfn_S=c#zKVIeH#E6W%8H+ literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack new file mode 100644 index 0000000000000000000000000000000000000000..73622aa52c0750c3d647d1d39e235077b0df6fab GIT binary patch literal 3999 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 R@AzV-R-~x4va}Sh1OP;7B9#CD diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack deleted file mode 100644 index ddb8c16caf1f0600bf22af94b7f41c3799679617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6316 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 P<#0@LlG?4MW7+sGiQYRB diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev deleted file mode 100644 index 81554dba7405b86a5e8db6c52a81b9c6590b0f0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmWIYbctYKU|@t|HXscGd_XJ!#2|5QAQl2*E+A$CVpbp)0b(8?W&vVeAm#*OW+3JV zVnHBg2VxE&7S6rA?4NMIZ23bUz3jdm$EWL5wC;O}2sbdA%~jT1wJNl|W?lK0SNV4U DT$U8_ diff --git a/tests/gitea-repositories-meta/user2/repo59.git/packed-refs b/tests/gitea-repositories-meta/user2/repo59.git/packed-refs index 77fedbf67d..b3e7aa4eca 100644 --- a/tests/gitea-repositories-meta/user2/repo59.git/packed-refs +++ b/tests/gitea-repositories-meta/user2/repo59.git/packed-refs @@ -1,4 +1,4 @@ # pack-refs with: peeled fully-peeled sorted d8f53dfb33f6ccf4169c34970b5e747511c18beb refs/heads/cake-recipe -80b83c5c8220c3aa3906e081f202a2a7563ec879 refs/heads/master +f3e315de30a90851c5b27f824a3c4efc3caa9941 refs/heads/master d8f53dfb33f6ccf4169c34970b5e747511c18beb refs/tags/v1.0 diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 7370b63dcd..3d268e68cd 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -587,6 +587,26 @@ func TestRenamedFileHistory(t *testing.T) { assert.Equal(t, "/user2/repo59/commits/commit/80b83c5c8220c3aa3906e081f202a2a7563ec879/licnse", oldFileHistoryLink) }) + t.Run("Renamed file, pagination", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + defer test.MockVariableValue(&setting.Git.CommitsRangeSize, 1)() // Limit commits displayed on the page to one + + resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo59/commits/branch/master/license"), http.StatusOK) + page1 := NewHTMLParser(t, resp.Body) + + resp = MakeRequest(t, NewRequest(t, "GET", "/user2/repo59/commits/branch/master/license?page=2"), http.StatusOK) + page2 := NewHTMLParser(t, resp.Body) + + // Browse further is only shown on 2nd page + browseFurtherSel := ".ui.bottom.attached.header a[href='/user2/repo59/commits/commit/80b83c5c8220c3aa3906e081f202a2a7563ec879/licnse']" + page1.AssertElement(t, browseFurtherSel, false) + page2.AssertElement(t, browseFurtherSel, true) + + // Pagination goes after Browser further + afterBrowseFurther := page2.Find(browseFurtherSel).Parent().Parent().NextAll() + assert.Equal(t, 1, afterBrowseFurther.Find(".pagination.menu").Length()) + }) + t.Run("Non renamed file", func(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo59/commits/branch/master/README.md") resp := MakeRequest(t, req, http.StatusOK)