aboutsummaryrefslogtreecommitdiffstats
path: root/services/pull/merge.go
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add configurable Trust Models (#11712)zeripath2020-09-201-5/+14
* [Vendor] Switch go-version lib (#12719)65432020-09-051-7/+5
* Default empty merger list to those with write permissions (#12535)zeripath2020-08-201-1/+1
* Prevent merge of outdated PRs on protected branches (#11012)65432020-04-161-2/+8
* fix (#11066)65432020-04-141-0/+3
* Load pr Issue Poster on API too (#11033)65432020-04-101-0/+4
* [suggest] change merge strategy： do not check write access if user in merge...j.yao.SUSE2020-04-081-4/+1
* Fix rebase conflict detection in git 2.26 (#10929)zeripath2020-04-031-6/+23
* Handle push rejection in branch and upload (#10854)zeripath2020-03-281-4/+2
* Display pull request head branch even the branch deleted or repository delete...Lunny Xiao2020-03-021-17/+13
* Handle push rejection message in Merge & Web Editor (#10373)zeripath2020-02-221-0/+9
* Only check for conflicts/merging if the PR has not been merged in the interim...zeripath2020-02-101-39/+50
* Add "Update Branch" button to Pull Requests (#9784)65432020-01-171-45/+55
* Fix admin handling at merge of PR (#9749)David Svantesson2020-01-161-3/+0
* [refactor] notify remove unused praram (#9804)65432020-01-161-1/+1
* Add require signed commit for protected branch (#9708)zeripath2020-01-151-1/+16
* Allow repo admin to merge PR regardless of review status (#9611)David Svantesson2020-01-111-5/+62
* Don't attempt to close issue if already closed (#9696)guillep2k2020-01-111-2/+4
* Mark PR reviews as stale at push and allow to dismiss stale approvals (#9532)David Svantesson2020-01-091-1/+1
* Sign protected branches (#8993)zeripath2019-12-151-1/+1
* Remove SavePatch and generate patches on the fly (#9302)zeripath2019-12-131-75/+3
* Move merge actions to notification (#9024)Lunny Xiao2019-11-211-19/+1
* Close/reopen issues by keywords in titles and comments (#8866)guillep2k2019-11-181-0/+22
* Move transfer repository and rename repository on a service package and start...Lunny Xiao2019-11-151-2/+10
* Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)zeripath2019-11-101-91/+214
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 07:36:48 +0000