summaryrefslogtreecommitdiffstats
path: root/services/pull/merge.go
Commit message (Expand)AuthorAgeFilesLines
* 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
* Move pull webhook to notification (#8805)Lunny Xiao2019-11-051-12/+2
* Rename HookQueue to hookQueue (#8778)Lunny Xiao2019-11-021-2/+0
* Move webhook to a standalone package under modules (#8747)Lunny Xiao2019-11-011-2/+3
* Allow to merge if file path contains " or \ (#8629)Ilya2019-11-011-2/+24
* Fix bug on pull requests when transfer head repository (#8564)Lunny Xiao2019-10-181-4/+7
* Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631)zeripath2019-10-161-9/+55
* Move AddTestPullRequestTask to pull service package from models (#8324)Lunny Xiao2019-10-151-1/+1
* Restore functionality for early gits (#7775)zeripath2019-10-121-24/+54
* Extract actions on new pull request from models to pulls service and move cod...Lunny Xiao2019-09-271-0/+320