3 Commits

Author	SHA1	Message	Date
Lunny Xiao	8ea60e7e61	remove duplicated webhook trigger (#7511)	2019-07-18 16:54:55 +08:00
zeripath	3563650bdb	#6946 Run hooks on merge/edit and cope with protected branches (#6961) ... * Fix #6946 by checking PullRequest ID on pushing * Ensure we have the owner name, the pr attributes and the the issue * Fix TestSearchRepo by waiting till indexing is done * Update integrations/repo_search_test.go * changes as per @mrsdizzie * missing comma * Spelling mistake * Fix full pushing environment	2019-07-01 09:18:13 +08:00
zeripath	baefea311f	Fix #732: Add LFS objects to base repository on merging (#7082) ... On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)	2019-06-22 18:35:34 +01:00