mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08: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:
		@@ -61,10 +61,11 @@ func TestPullRequestsNewest(t *testing.T) {
 | 
			
		||||
		Labels:   []string{},
 | 
			
		||||
	})
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
	assert.Equal(t, int64(2), count)
 | 
			
		||||
	if assert.Len(t, prs, 2) {
 | 
			
		||||
		assert.Equal(t, int64(2), prs[0].ID)
 | 
			
		||||
		assert.Equal(t, int64(1), prs[1].ID)
 | 
			
		||||
	assert.EqualValues(t, 3, count)
 | 
			
		||||
	if assert.Len(t, prs, 3) {
 | 
			
		||||
		assert.EqualValues(t, 5, prs[0].ID)
 | 
			
		||||
		assert.EqualValues(t, 2, prs[1].ID)
 | 
			
		||||
		assert.EqualValues(t, 1, prs[2].ID)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -77,10 +78,11 @@ func TestPullRequestsOldest(t *testing.T) {
 | 
			
		||||
		Labels:   []string{},
 | 
			
		||||
	})
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
	assert.Equal(t, int64(2), count)
 | 
			
		||||
	if assert.Len(t, prs, 2) {
 | 
			
		||||
		assert.Equal(t, int64(1), prs[0].ID)
 | 
			
		||||
		assert.Equal(t, int64(2), prs[1].ID)
 | 
			
		||||
	assert.EqualValues(t, 3, count)
 | 
			
		||||
	if assert.Len(t, prs, 3) {
 | 
			
		||||
		assert.EqualValues(t, 1, prs[0].ID)
 | 
			
		||||
		assert.EqualValues(t, 2, prs[1].ID)
 | 
			
		||||
		assert.EqualValues(t, 5, prs[2].ID)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user