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 1c2f793d1c..be6462b269 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 d151dc87e6..f85243ea3f 100644 Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph and b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph differ diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs index 0374746b5e..43c2b98699 100644 --- a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs +++ b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs @@ -1,2 +1,2 @@ -P pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack +P pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx new file mode 100644 index 0000000000..2f71563020 Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx differ 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 0000000000..73622aa52c Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack differ diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev new file mode 100644 index 0000000000..a03b42c9c0 Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev differ diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx deleted file mode 100644 index aaa9981cf5..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx and /dev/null differ 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 ddb8c16caf..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack and /dev/null differ 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 81554dba74..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev and /dev/null differ 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 3d5922c0b1..898d0d1fa6 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)