diff options
| author | 6543 <6543@obermui.de> | 2020-01-17 07:03:40 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-17 08:03:40 +0200 |
| commit | 36943e56d66a2d711a6b0c27219ce91a3ddc020a (patch) | |
| tree | 6e1c57454beeaa9d64470c82db1140a5f540ad65 /models/fixtures/pull_request.yml | |
| parent | 9f40bb020eaea153eca77d3071a4f2cc8bcd2a8e (diff) | |
| download | gitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.tar.gz gitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.zip | |
Add "Update Branch" button to Pull Requests (#9784)
* 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>
Diffstat (limited to 'models/fixtures/pull_request.yml')
| -rw-r--r-- | models/fixtures/pull_request.yml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/models/fixtures/pull_request.yml b/models/fixtures/pull_request.yml index e8d81a0007..da9566bc48 100644 --- a/models/fixtures/pull_request.yml +++ b/models/fixtures/pull_request.yml @@ -49,4 +49,17 @@ head_branch: branch1 base_branch: master merge_base: abcdef1234567890 - has_merged: false
\ No newline at end of file + 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 |