aboutsummaryrefslogtreecommitdiffstats
path: root/modules/pull/merge.go
Commit message (Expand)AuthorAgeFilesLines
* Allow to merge if file path contains " or \ (#8629) (#8772)zeripath2019-11-011-2/+24
* Restore functionality for early gits (#7775) (#8476)zeripath2019-10-131-24/+53
* Fix pull merge 500 error caused by git-fetch breaking behaviors (#8194)Mura Li2019-09-161-1/+1
* Avoid ambiguity of branch/directory names for the git-diff-tree command (#806...Mura Li2019-09-031-2/+1
* Fix duplicate call of webhook (#7821) (#7824)Antoine GIRARD2019-08-121-33/+0
* Fix bug create/edit wiki pages when code master branch protected (#7580) (#7623)Lunny Xiao2019-07-261-1/+7
* Fix panic on push at #7611 (#7615) (#7618)zeripath2019-07-251-1/+1
* remove duplicated webhook trigger (#7511) (#7516)Lunny Xiao2019-07-181-1/+0
* #6946 Run hooks on merge/edit and cope with protected branches (#6961)zeripath2019-07-011-1/+11
* Fix #732: Add LFS objects to base repository on merging (#7082)zeripath2019-06-221-0/+339