aboutsummaryrefslogtreecommitdiffstats
path: root/services/pull/merge.go
Commit message (Expand)AuthorAgeFilesLines
* refactor some functions to support ctx as first parameter (#21878)Lunny Xiao2022-12-031-2/+2
* Implement FSFE REUSE for golang files (#21840)flynnnnnnnnnn2022-11-271-2/+1
* Add `context.Context` to more methods (#21546)KN4CK3R2022-11-191-18/+18
* Allow detect whether it's in a database transaction for a context.Context (#2...Lunny Xiao2022-11-121-1/+1
* feat: notify doers of a merge when automerging (#21553)kolaente2022-11-031-2/+6
* Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)delvh2022-10-241-28/+28
* Refactor git command arguments and make all arguments to be safe to be used (...wxiaoguang2022-10-231-18/+21
* Do DB update after merge in hammer context (#21401)zeripath2022-10-111-10/+12
* Add more linters to improve code readability (#19989)Wim2022-06-201-2/+2
* Remove legacy git code (ver < 2.0), fine tune markup tests (#19930)wxiaoguang2022-06-161-18/+9
* Move issues related files into models/issues (#19931)Lunny Xiao2022-06-131-14/+15
* Move some code into models/git (#19879)Lunny Xiao2022-06-121-6/+7
* Refactor git module, make Gitea use internal git config (#19732)wxiaoguang2022-06-101-6/+0
* Move access and repo permission to models/perm/access (#19350)Lunny Xiao2022-05-111-1/+2
* Move some helper files out of models (#19355)Lunny Xiao2022-05-081-2/+3
* Delete related PullAutoMerge and ReviewState on User/Repo Deletion (#19649)65432022-05-081-1/+1
* Allow custom default merge message with .gitea/default_merge_message/<merge_s...Lunny Xiao2022-05-081-8/+101
* Auto merge pull requests when all checks succeeded via API (#9307)kolaente2022-05-081-0/+6
* PullService lock via pullID (#19520)65432022-05-041-1/+6
* Use for a repo action one database transaction (#19576)65432022-05-031-56/+66
* Dont overwrite err with nil & rename PullCheckingFuncs to reflect there usage...65432022-05-021-2/+2
* more context for models (#19511)65432022-04-281-3/+3
* Move milestone to models/issues/ (#19278)Lunny Xiao2022-04-081-2/+2
* Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)wxiaoguang2022-04-011-86/+70
* Move checks for pulls before merge into own function (#19271)65432022-03-311-21/+6
* Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/mo...wxiaoguang2022-03-221-3/+2
* Change git.cmd to RunWithContext (#18693)Martin Scholz2022-02-111-16/+115
* Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)65432022-02-061-17/+17
* format with gofumpt (#18184)65432022-01-201-2/+2
* Propagate context and ensure git commands run in request context (#17868)zeripath2022-01-191-35/+36
* Restore propagation of ErrDependenciesLeft (#18325)zeripath2022-01-191-1/+4
* Fix various typos (#18219)luzpaz2022-01-101-1/+1
* Abort merge if head has been updated before pressing merge (#18032)zeripath2021-12-201-3/+17
* Move keys to models/asymkey (#17917)Lunny Xiao2021-12-101-2/+3
* Move repository model into models/repo (#17933)Lunny Xiao2021-12-101-18/+20
* Refactor various strings (#17784)mscherer2021-12-021-2/+2
* Make Co-committed-by and co-authored-by trailers optional (#17848)zeripath2021-11-291-1/+1
* Move user related model into models/user (#17781)Lunny Xiao2021-11-241-7/+8
* Remove unnecassary calls to `filepath.Join` (#17608)Gusted2021-11-151-2/+2
* Move unit into models/unit/ (#17576)Lunny Xiao2021-11-091-4/+5
* refactor: move from io/ioutil to io and os package (#17109)Eng Zer Jun2021-09-221-3/+2
* Add option to update pull request by `rebase` (#16125)a10121127962021-08-311-1/+16
* Always set the merge base used to merge the commit (#15352)zeripath2021-04-101-1/+1
* Code Formats, Nits & Unused Func/Var deletions (#15286)65432021-04-091-1/+1
* Make manual merge autodetection optional and add manual merge as merge method...a10121127962021-03-031-0/+51
* Standardize Co-Authored-By / Reviewed-By strings (#14097)Cirno the Strongest2020-12-211-1/+1
* Fix Pull Merge when tag with same name as base branch exist (#13882)a10121127962020-12-081-1/+1
* Add block on official review requests branch protection (#13705)a10121127962020-11-281-0/+5
* go-version constraints ignore pre-releases (#13234)zeripath2020-10-211-3/+3
* [Enhancement] Allow admin to merge pr with protected file changes (#12078)赵智超2020-10-131-1/+11
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 18:57:07 +0000