diff --git a/models/fixtures/pull_request.yml b/models/fixtures/pull_request.yml index 165437f0328dd..31621b6a38b73 100644 --- a/models/fixtures/pull_request.yml +++ b/models/fixtures/pull_request.yml @@ -8,7 +8,7 @@ base_repo_id: 1 head_branch: branch1 base_branch: master - merge_base: 4a357436d925b5c974181ff12a994538ddc5a269 + merge_base: 40587f82e2bae1309157cef04b91da7e96a7ed20 has_merged: true merger_id: 2 @@ -22,7 +22,7 @@ base_repo_id: 1 head_branch: branch2 base_branch: master - merge_base: 4a357436d925b5c974181ff12a994538ddc5a269 + merge_base: 40587f82e2bae1309157cef04b91da7e96a7ed20 has_merged: false - @@ -61,7 +61,7 @@ base_repo_id: 1 head_branch: pr-to-update base_branch: branch2 - merge_base: 985f0301dba5e7b34be866819cd15ad3d8f508ee + merge_base: a270587a5cf3bcfa12c4c58f771ff58ee9694f43 has_merged: false - diff --git a/models/fixtures/release.yml b/models/fixtures/release.yml index 1703f959d2687..e6044da667cfb 100644 --- a/models/fixtures/release.yml +++ b/models/fixtures/release.yml @@ -5,8 +5,8 @@ lower_tag_name: "v1.1" target: "master" title: "testing-release" - sha1: "65f1bf27bc3bf70f64657658635e66094edbcb4d" - num_commits: 10 + sha1: "0d653ed2b0d85ea39fefc1c193bf49c09eaac731" + num_commits: 3 is_draft: false is_prerelease: false is_tag: false @@ -19,8 +19,8 @@ lower_tag_name: "v1.1" target: "master" title: "testing-release" - sha1: "65f1bf27bc3bf70f64657658635e66094edbcb4d" - num_commits: 10 + sha1: "0d653ed2b0d85ea39fefc1c193bf49c09eaac731" + num_commits: 3 is_draft: false is_prerelease: false is_tag: false @@ -33,7 +33,7 @@ lower_tag_name: "delete-tag" target: "master" title: "delete-tag" - sha1: "65f1bf27bc3bf70f64657658635e66094edbcb4d" + sha1: "0d653ed2b0d85ea39fefc1c193bf49c09eaac731" num_commits: 10 is_draft: false is_prerelease: false @@ -60,9 +60,23 @@ target: "master" title: "pre-release" note: "some text for a pre release" - sha1: "65f1bf27bc3bf70f64657658635e66094edbcb4d" + sha1: "2f58a0d23e6e6bc235613f0d53482298a0862fac" num_commits: 1 is_draft: false is_prerelease: true is_tag: false - created_unix: 946684800 + created_unix: 946684700 # before v1.1 + +- id: 6 + repo_id: 1 + publisher_id: 2 + tag_name: "v0.1" + lower_tag_name: "v0.1" + target: "master" + title: "initial" + sha1: "2f58a0d23e6e6bc235613f0d53482298a0862fac" + num_commits: 1 + is_draft: false + is_prerelease: false + is_tag: false + created_unix: 946684600 # before v1.0 diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 50a5fade789a1..c33d1ff73e9d3 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -46,7 +46,7 @@ func TestRepoStatsIndex(t *testing.T) { status, err := repo_model.GetIndexerStatus(db.DefaultContext, repo, repo_model.RepoIndexerTypeStats) assert.NoError(t, err) - assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", status.CommitSha) + assert.Equal(t, "0d653ed2b0d85ea39fefc1c193bf49c09eaac731", status.CommitSha) langs, err := repo_model.GetTopLanguageStats(repo, 5) assert.NoError(t, err) assert.Empty(t, langs) diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index f8b84485c06d5..e9d6c7d772c7f 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -49,7 +49,7 @@ func TestRender_Commits(t *testing.T) { assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer)) } - sha := "65f1bf27bc3bf70f64657658635e66094edbcb4d" + sha := "0d653ed2b0d85ea39fefc1c193bf49c09eaac731" repo := TestRepoURL commit := util.URLJoin(repo, "commit", sha) tree := util.URLJoin(repo, "tree", sha, "src") @@ -61,20 +61,20 @@ func TestRender_Commits(t *testing.T) { commitCompare := util.URLJoin(repo, "compare", sha+"..."+sha) commitCompareWithHash := commitCompare + "#L2" - test(sha, `

65f1bf27bc

`) - test(sha[:7], `

65f1bf2

`) - test(sha[:39], `

65f1bf27bc

`) - test(commit, `

65f1bf27bc

`) - test(tree, `

65f1bf27bc/src

`) + test(sha, `

0d653ed7bc

`) + test(sha[:7], `

0d653ed

`) + test(sha[:39], `

0d653ed7bc

`) + test(commit, `

0d653ed7bc

`) + test(tree, `

0d653ed7bc/src

`) - test(file, `

65f1bf27bc/example.txt

`) - test(fileWithExtra, `

65f1bf27bc/example.txt:

`) - test(fileWithHash, `

65f1bf27bc/example.txt (L2)

`) - test(fileWithHasExtra, `

65f1bf27bc/example.txt (L2):

`) - test(commitCompare, `

65f1bf27bc...65f1bf27bc

`) - test(commitCompareWithHash, `

65f1bf27bc...65f1bf27bc (L2)

`) + test(file, `

0d653ed7bc/example.txt

`) + test(fileWithExtra, `

0d653ed7bc/example.txt:

`) + test(fileWithHash, `

0d653ed7bc/example.txt (L2)

`) + test(fileWithHasExtra, `

0d653ed7bc/example.txt (L2):

`) + test(commitCompare, `

0d653ed7bc...0d653ed7bc

`) + test(commitCompareWithHash, `

0d653ed7bc...0d653ed7bc (L2)

`) - test("commit "+sha, `

commit 65f1bf27bc

`) + test("commit "+sha, `

commit 0d653ed7bc

`) test("/home/gitea/"+sha, "

/home/gitea/"+sha+"

") test("deadbeef", `

deadbeef

`) test("d27ace93", `

d27ace93

`) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index 0c7650a5ffabc..bd4ada4299ff1 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -127,7 +127,7 @@ func testAnswers(baseURLContent, baseURLImages string) []string {
  • Links, Language bindings, Engine bindings
  • Tips
  • -

    See commit 65f1bf27bc

    +

    See commit 0d653ed7bc

    Ideas and codes