4 people 682f0b0460 Fix Pull Merge when tag with same name as base branch exist (#13882) ...

fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851
Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: 6543 <[email protected]>
Co-authored-by: zeripath <[email protected]>

2020-12-08 02:46:50 +01:00

..

check_test.go

Only check for conflicts/merging if the PR has not been merged in the interim (#10132)

2020-02-10 01:09:31 +02:00

check.go

[Enhancement] Allow admin to merge pr with protected file changes (#12078)

2020-10-13 14:50:57 -04:00

commit_status.go

Fix bug on pull view when required status check no ci result (#10648)

2020-03-07 07:33:20 +00:00

lfs.go

Add basic repository lfs management (#7199)

2019-10-28 18:31:55 +00:00

main_test.go

Move some pull request functions from models to services (#9266)

2019-12-06 21:44:10 -05:00

merge.go

Fix Pull Merge when tag with same name as base branch exist (#13882)

2020-12-08 02:46:50 +01:00

patch.go

[Enhancement] Allow admin to merge pr with protected file changes (#12078)

2020-10-13 14:50:57 -04:00

pull_test.go

Move PushToBaseRepo from models to services/pull (#9352)

2019-12-15 04:28:51 +01:00

pull.go

Increment skip to avoid infini-loop (#13703)

2020-11-27 22:00:52 +02:00

review.go

Comments on review should have the same sha (#13448)

2020-11-09 01:15:09 -05:00

temp_repo.go

Handle more pathological branch and tag names (#11843)

2020-06-11 19:49:47 -04:00

update.go

Check Push permissions on IsUserAllowedToUpdate (#11448)

2020-05-16 20:48:30 -04:00