Commit Graph

42 Commits (7815f244d6254f85fca439b0bbfaf63c0e263ea4)

Author SHA1 Message Date
zeripath 84f5a0bc62
Always set the merge base used to merge the commit (#15352) 4 years ago
6543 9c4601bdf8
Code Formats, Nits & Unused Func/Var deletions (#15286) 4 years ago
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543) 4 years ago
Cirno the Strongest 2c9dd71140
Standardize Co-Authored-By / Reviewed-By strings (#14097) 4 years ago
a1012112796 682f0b0460
Fix Pull Merge when tag with same name as base branch exist (#13882) 4 years ago
a1012112796 9c26dc1f3a
Add block on official review requests branch protection (#13705) 4 years ago
zeripath de6e427a01
go-version constraints ignore pre-releases (#13234) 4 years ago
赵智超 dfa7291f8f
[Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
zeripath 4979f15c3f
Add configurable Trust Models (#11712) 4 years ago
6543 bc11caff94
[Vendor] Switch go-version lib (#12719) 4 years ago
zeripath d15bb17b78
Default empty merger list to those with write permissions (#12535) 4 years ago
6543 c52d48aae4
Prevent merge of outdated PRs on protected branches (#11012) 5 years ago
6543 f7ecc2bee7
fix (#11066) 5 years ago
6543 d21b974f6c
Load pr Issue Poster on API too (#11033) 5 years ago
j.yao.SUSE b40107c416
[suggest] change merge strategy: do not check write access if user in merge white list (#10951) 5 years ago
zeripath 97eb37e823
Fix rebase conflict detection in git 2.26 (#10929) 5 years ago
zeripath 7cd47046ea
Handle push rejection in branch and upload (#10854) 5 years ago
Lunny Xiao 5abe1c52de
Display pull request head branch even the branch deleted or repository deleted (#10413) 5 years ago
zeripath 089ccb0c80
Handle push rejection message in Merge & Web Editor (#10373) 5 years ago
zeripath 875c5e1305 Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 5 years ago
6543 36943e56d6 Add "Update Branch" button to Pull Requests (#9784) 5 years ago
David Svantesson 18e0447b3f Fix admin handling at merge of PR (#9749) 5 years ago
6543 06cd3e03a2 [refactor] notify remove unused praram (#9804) 5 years ago
zeripath 66ee9b87f9 Add require signed commit for protected branch (#9708) 5 years ago
David Svantesson 32fb813133 Allow repo admin to merge PR regardless of review status (#9611) 5 years ago
guillep2k 705b1e49a8 Don't attempt to close issue if already closed (#9696) 5 years ago
David Svantesson 25531c71a7 Mark PR reviews as stale at push and allow to dismiss stale approvals (#9532) 5 years ago
zeripath 3abe17f9e0
Sign protected branches (#8993) 5 years ago
zeripath 74179d1b5e Remove SavePatch and generate patches on the fly (#9302) 5 years ago
Lunny Xiao d7ac9727bb Move merge actions to notification (#9024) 5 years ago
guillep2k b15f26b1cf Close/reopen issues by keywords in titles and comments (#8866) 5 years ago
Lunny Xiao 21ae9838e0
Move transfer repository and rename repository on a service package and start action notification (#8573) 5 years ago
zeripath 8eeb2877d5
Adjust error reporting from merge failures and use LC_ALL=C for git (#8548) 5 years ago
Lunny Xiao aaeef295bb
Move pull webhook to notification (#8805) 5 years ago
Lunny Xiao f518fe6662
Rename HookQueue to hookQueue (#8778) 5 years ago
Lunny Xiao 0e7f7df3cf Move webhook to a standalone package under modules (#8747) 5 years ago
Ilya ac0fb36c41 Allow to merge if file path contains " or \ (#8629) 5 years ago
Lunny Xiao 945f121262
Fix bug on pull requests when transfer head repository (#8564) 5 years ago
zeripath fcb535c5c3
Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 5 years ago
Lunny Xiao 34fb9d68a5 Move AddTestPullRequestTask to pull service package from models (#8324) 5 years ago
zeripath 5e759b60cc Restore functionality for early gits (#7775) 5 years ago
Lunny Xiao eb11ca6847
Extract actions on new pull request from models to pulls service and move code.gitea.io/gitea/modules/pull to code.gitea.io/gitea/services/pull (#8218) 5 years ago
Mura Li a5f87feefd Fix pull merge 500 error caused by git-fetch breaking behaviors (#8161) 5 years ago
Mura Li c027eac1d6 Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066) 5 years ago
Lunny Xiao 85202d4784
Display ui time with customize time location (#7792) 5 years ago
Antoine GIRARD e9bb75d8d1 Fix duplicate call of webhook (#7821) 5 years ago
Lunny Xiao 6782a704ef Fix bug create/edit wiki pages when code master branch protected (#7580) 5 years ago
zeripath 6485962dd5
Fix panic on push at #7611 (#7615) 5 years ago
Lunny Xiao 8ea60e7e61
remove duplicated webhook trigger (#7511) 5 years ago
zeripath 3563650bdb #6946 Run hooks on merge/edit and cope with protected branches (#6961) 5 years ago