Commit Graph

199 Commits (8769df117d6cc2f4ab00d6e1d54ef4241d063f11)

Author SHA1 Message Date
6543 210b096da7
Ensure that all unmerged files are merged when conflict checking (#20528) (#20536) 2 years ago
6543 e930d66a9c
Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407) 2 years ago
Ing. Jaroslav Šafka 92a43d577d
Fix checks in PR for empty commits (#20290) (#20352) 2 years ago
Lunny Xiao 3e4fe009e7
Check if project has the same repository id with issue when assign project to issue (#20133) (#20188) 3 years ago
wxiaoguang 157b405753
Remove legacy git code (ver < 2.0), fine tune markup tests (#19930) 3 years ago
Lunny Xiao 1a9821f57a
Move issues related files into models/issues (#19931) 3 years ago
Lunny Xiao 110fc57cbc
Move some code into models/git (#19879) 3 years ago
wxiaoguang a0051634b9
Refactor git module, make Gitea use internal git config (#19732) 3 years ago
Lunny Xiao fd7d83ace6
Move almost all functions' parameter db.Engine to context.Context (#19748) 3 years ago
Lunny Xiao cbd45471b1
Move access and repo permission to models/perm/access (#19350) 3 years ago
Lunny Xiao 4ca1d7547a
Move some helper files out of models (#19355) 3 years ago
6543 6a969681cd
Delete related PullAutoMerge and ReviewState on User/Repo Deletion (#19649) 3 years ago
Lunny Xiao 4344a64107
Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 3 years ago
kolaente 59b30f060a
Auto merge pull requests when all checks succeeded via API (#9307) 3 years ago
6543 f034ee6cf0
PullService lock via pullID (#19520) 3 years ago
6543 92f139d091
Use for a repo action one database transaction (#19576) 3 years ago
6543 d8905cb623
Dont overwrite err with nil & rename PullCheckingFuncs to reflect there usage (#19572) 3 years ago
qwerty287 8eb1cd9264
Add "Allow edits from maintainer" feature (#18002) 3 years ago
6543 06e4687cec
more context for models (#19511) 3 years ago
parnic cdab46220d
Add commit status popup to issuelist (#19375) 3 years ago
Gusted ebe569a268
Set correct PR status on 3way on conflict checking (#19457) 3 years ago
Gusted 5e68fe7d37
Don't allow merging PR's which are being conflict checked (#19357) 3 years ago
Lunny Xiao b8911fb456
Use a struct as test options (#19393) 3 years ago
Lunny Xiao 1dfa26e00e
Move milestone to models/issues/ (#19278) 3 years ago
wxiaoguang 124b072f0b
Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 3 years ago
zeripath c88547ce71
Add Goroutine stack inspector to admin/monitor (#19207) 3 years ago
6543 9c349a4277
Move checks for pulls before merge into own function (#19271) 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
Lunny Xiao 74731c3a5a
Move some issue methods as functions (#19255) 3 years ago
wxiaoguang 7a550b3af2
Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163) 3 years ago
Jimmy Praet 5184c83f6b
Add config option to disable "Update branch by rebase" (#18745) 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 a82fd98d53
Pause queues (#15928) 3 years ago
qwerty287 1f40933d38
Add config options to hide issue events (#17414) 3 years ago
6543 54e9ee37a7
format with gofumpt (#18184) 3 years ago
zeripath 5cb0c9aa0d
Propagate context and ensure git commands run in request context (#17868) 3 years ago
zeripath 4a20eadfd7
Restore propagation of ErrDependenciesLeft (#18325) 3 years ago
zeripath 089b4e6a45
Use indirect comparison when showing pull requests (#18313) 3 years ago
luzpaz 8c647bf0f6
Fix various typos (#18219) 3 years ago
zeripath 431e482e3f
Reset the conflicted files list in testpatch (#18139) 3 years ago
Gusted ff2fd08228
Simplify parameter types (#18006) 3 years ago
zeripath e4e411821d
Abort merge if head has been updated before pressing merge (#18032) 3 years ago
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 3 years ago
zeripath 8354670708
Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) 3 years ago
qwerty287 9d943bf374
Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
Lunny Xiao 3ca5dc7e32
Move keys to models/asymkey (#17917) 3 years ago