1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

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>
This commit is contained in:
6543
2020-01-17 07:03:40 +01:00
committed by Lauris BH
parent 9f40bb020e
commit 36943e56d6
32 changed files with 489 additions and 68 deletions

View File

@@ -122,3 +122,15 @@
created_unix: 946684830
updated_unix: 999307200
deadline_unix: 1019307200
-
id: 11
repo_id: 1
index: 5
poster_id: 1
name: pull5
content: content for the a pull request
is_closed: false
is_pull: true
created_unix: 1579194806
updated_unix: 1579194806

View File

@@ -49,4 +49,17 @@
head_branch: branch1
base_branch: master
merge_base: abcdef1234567890
has_merged: false
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

View File

@@ -7,7 +7,7 @@
is_private: false
num_issues: 2
num_closed_issues: 1
num_pulls: 2
num_pulls: 3
num_closed_pulls: 0
num_milestones: 3
num_closed_milestones: 1