Commit Graph

29 Commits (bc4cce138acf61a1a934098f08c3011126070424)

Author SHA1 Message Date
zeripath 7a428fae4b
Ensure that all unmerged files are merged when conflict checking (#20528) 2 years ago
Ing. Jaroslav Šafka 8420c1bf4c
Fix checks in PR for empty commits #19603 (#20290) 2 years ago
Lunny Xiao 1a9821f57a
Move issues related files into models/issues (#19931) 2 years ago
Lunny Xiao 4ca1d7547a
Move some helper files out of models (#19355) 3 years ago
6543 06e4687cec
more context for models (#19511) 3 years ago
Gusted ebe569a268
Set correct PR status on 3way on conflict checking (#19457) 3 years ago
wxiaoguang 124b072f0b
Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 3 years ago
6543 3e88af898a
Make git.OpenRepository accept Context (#19260) 3 years ago
zeripath 1eebbf23f0
When conflicts have been previously detected ensure that they can be resolved (#19247) 3 years ago
Martin Scholz 26718a785a
Change git.cmd to RunWithContext (#18693) 3 years ago
zeripath eb748f5f3c
Add apply-patch, basic revert and cherry-pick functionality (#17902) 3 years ago
6543 3043eb36bf
Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552) 3 years ago
zeripath 92e81e97e8
Detect conflicts with 3way merge (#18536) 3 years ago
zeripath 5cb0c9aa0d
Propagate context and ensure git commands run in request context (#17868) 3 years ago
zeripath 431e482e3f
Reset the conflicted files list in testpatch (#18139) 3 years ago
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 3 years ago
Lunny Xiao 99b2858e62
Move unit into models/unit/ (#17576) 3 years ago
Norwin f48dce3176
Don't return binary file changes in raw PR diffs by default (#17158) 3 years ago
Eng Zer Jun f2e7d5477f
refactor: move from io/ioutil to io and os package (#17109) 3 years ago
Jimmy Praet 3d6cb25e31
Support unprotected file patterns (#16395) 3 years ago
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543) 4 years ago
赵智超 dfa7291f8f
[Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
zeripath 74bd9691c6
Re-attempt to delete temporary upload if the file is locked by another process (#12447) 4 years ago
zeripath 57cca44c5e
Generate Diff and Patch direct from Pull head (#10936) 5 years ago
6543 4160bd6ef1
Remove Unused Functions (#10516) 5 years ago
zeripath 66ee9b87f9 Add require signed commit for protected branch (#9708) 5 years ago
Lunny Xiao 5765212c6d
Add owner_name column for table repository for maintaince reason (#9717) 5 years ago
zeripath 0d515474b8
Remove stray printf (#9631) 5 years ago
zeripath 74179d1b5e Remove SavePatch and generate patches on the fly (#9302) 5 years ago