9 Commits

Author	SHA1	Message	Date
Mura Li	a5f87feefd	Fix pull merge 500 error caused by git-fetch breaking behaviors (#8161)	2019-09-15 23:03:08 -04:00
Mura Li	c027eac1d6	Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066)	2019-09-03 15:42:01 +03:00
Lunny Xiao	85202d4784	Display ui time with customize time location (#7792) ... * display ui time with customize time location * fix lint * rename UILocation to DefaultUILocation * move time related functions to modules/timeutil * fix tests * fix tests * fix build * fix swagger	2019-08-15 22:46:21 +08:00
Antoine GIRARD	e9bb75d8d1	Fix duplicate call of webhook (#7821)	2019-08-11 23:31:18 +03:00
Lunny Xiao	6782a704ef	Fix bug create/edit wiki pages when code master branch protected (#7580) ... * fix bug create/edit wiki pages when code master branch protected * improve FullPushingEnvironment function	2019-07-25 22:50:20 +01:00
zeripath	6485962dd5	Fix panic on push at #7611 (#7615) ... * Fix panic in #7611 Use pr.IssueID instead of pr.Issue.ID as Issue may not be loaded and is unnecessary * Only fetch the head branch from the remote	2019-07-25 19:05:51 +01:00
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