aboutsummaryrefslogtreecommitdiffstats
path: root/modules/pull
Commit message (Collapse)AuthorAgeFilesLines
* Refuse merge until all required status checks success (#7481)Lunny Xiao2019-09-181-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refuse merge until ci successfully * deny merge request when required status checkes not succeed on merge Post and API * add database migration for added columns on protected_branch * fix migration * fix protected branch check bug * fix protected branch settings * remove duplicated code on check pull request's required commit statuses pass * remove unused codes * fix migration * add newline for template file * fix go mod * rename function name and some other fixes * fix template * fix bug pull view * remove go1.12 wrong dependencies * add administrator bypass when protected branch status check enabled * fix bug * improve the codes
* 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
| | | | | | | | | | | | | | | | | | * 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
* move CreateReview to moduels/pull (#7841)Lunny Xiao2019-08-141-0/+57
|
* 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 bug create/edit wiki pages when code master branch protected * improve FullPushingEnvironment function
* Fix panic on push at #7611 (#7615)zeripath2019-07-251-1/+1
| | | | | | | | * 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
* Removed unnecessary conversions (#7557)Christian Muehlhaeuser2019-07-231-1/+1
| | | No need to convert to the same type.
* 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 #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
* Fix #732: Add LFS objects to base repository on merging (#7082)zeripath2019-06-222-0/+565
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.)