mirror of
https://github.com/go-gitea/gitea
synced 2024-12-18 21:45:35 +01:00
36943e56d6
* add Divergence * add Update Button * first working version * re-use code * split raw merge commands and db-change functions (notify, cache, ...) * use rawMerge (remove redundant code) * own function to get Diverging of PRs * use FlashError * correct Error Msg * hook is triggerd ... so remove comment * add "branch2" to "user2/repo1" because it unit-test "TestPullView_ReviewerMissed" use it but dont exist jet :/ * move GetPerm to IsUserAllowedToUpdate * add Flash Success MSG * imprufe code - remove useless js chage * fix-lint * TEST: add PullRequest ID:5 Repo: user2/repo1 Base: branch1 Head: pr-to-update * correct comments * make PR5 outdated * fix Tests * WIP: add pull update test * update revs * update locales * working TEST * update UI * misspell * change style * add 1s delay so rev exist * move row up (before merge row) * fix lint nit * UI remove divider * Update style * nits * do it right * introduce IsSameRepo * remove useless check Co-authored-by: Lauris BH <lauris@nix.lv>
65 lines
1.2 KiB
YAML
65 lines
1.2 KiB
YAML
-
|
|
id: 1
|
|
type: 0 # gitea pull request
|
|
status: 2 # mergable
|
|
issue_id: 2
|
|
index: 2
|
|
head_repo_id: 1
|
|
base_repo_id: 1
|
|
head_branch: branch1
|
|
base_branch: master
|
|
merge_base: 1234567890abcdef
|
|
has_merged: true
|
|
merger_id: 2
|
|
|
|
-
|
|
id: 2
|
|
type: 0 # gitea pull request
|
|
status: 2 # mergable
|
|
issue_id: 3
|
|
index: 3
|
|
head_repo_id: 1
|
|
base_repo_id: 1
|
|
head_branch: branch2
|
|
base_branch: master
|
|
merge_base: fedcba9876543210
|
|
has_merged: false
|
|
|
|
-
|
|
id: 3
|
|
type: 0 # gitea pull request
|
|
status: 2 # mergable
|
|
issue_id: 8
|
|
index: 1
|
|
head_repo_id: 11
|
|
base_repo_id: 10
|
|
head_branch: branch2
|
|
base_branch: master
|
|
merge_base: 0abcb056019adb83
|
|
has_merged: false
|
|
|
|
-
|
|
id: 4
|
|
type: 0 # gitea pull request
|
|
status: 2 # mergable
|
|
issue_id: 9
|
|
index: 1
|
|
head_repo_id: 48
|
|
base_repo_id: 48
|
|
head_branch: branch1
|
|
base_branch: master
|
|
merge_base: abcdef1234567890
|
|
has_merged: false
|
|
|
|
-
|
|
id: 5 # this PR is outdated (one commit behind branch1 )
|
|
type: 0 # gitea pull request
|
|
status: 2 # mergable
|
|
issue_id: 11
|
|
index: 5
|
|
head_repo_id: 1
|
|
base_repo_id: 1
|
|
head_branch: pr-to-update
|
|
base_branch: branch1
|
|
merge_base: 1234567890abcdef
|
|
has_merged: false
|