summaryrefslogtreecommitdiffstats
path: root/modules/pull/merge.go
Commit message (Expand)AuthorAgeFilesLines
* Extract actions on new pull request from models to pulls service and move cod...Lunny Xiao2019-09-271-320/+0
* Fix pull merge 500 error caused by git-fetch breaking behaviors (#8161)Mura Li2019-09-151-1/+1
* Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066)Mura Li2019-09-031-2/+1
* Display ui time with customize time location (#7792)Lunny Xiao2019-08-151-2/+2
* Fix duplicate call of webhook (#7821)Antoine GIRARD2019-08-111-33/+0
* Fix bug create/edit wiki pages when code master branch protected (#7580)Lunny Xiao2019-07-251-1/+7
* Fix panic on push at #7611 (#7615)zeripath2019-07-251-1/+1
* remove duplicated webhook trigger (#7511)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