Commit Graph

8 Commits (20a28b785a3752980348cda1c88d99afa4b7dac3)

Author SHA1 Message Date
Mura Li 9e8df4b838 Fix pull merge 500 error caused by git-fetch breaking behaviors (#8194) 5 years ago
Mura Li e7f6da386f Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066) (#8070) 6 years ago
Antoine GIRARD 89915ca8a0 Fix duplicate call of webhook (#7821) (#7824) 6 years ago
Lunny Xiao 4c69e158e5 Fix bug create/edit wiki pages when code master branch protected (#7580) (#7623)
* fix bug create/edit wiki pages when code master branch protected

* improve FullPushingEnvironment function
6 years ago
zeripath b7e41f7b8f
Fix panic on push at #7611 (#7615) (#7618)
* 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
6 years ago
Lunny Xiao 3fd07a0be6
remove duplicated webhook trigger (#7511) (#7516) 6 years ago
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
6 years ago
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.)
6 years ago