Git with a cup of tea, painless self-hosted git service
Mirror for internal git.with.parts use
https://git.with.parts
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Jason Song
90982bffa5
Add force_merge to merge request and fix checking mergable ( #23010 ) ( #23032 ) ...
Backport #23010 .
Fix #23000 .
The bug was introduced in #22633 , and it seems that it has been noticed:
https://github.com/go-gitea/gitea/pull/22633#discussion_r1095395359 .
However, #22633 did nothing wrong, the logic should be "check if they is
admin only when `force` is true".
So we should provide the `ForceMerge` when merging from UI.
After this, an admin can also send a normal merge request with
`ForceMerge` false. So it fixes a potential bug: if the admin doesn't
want to do a force merge, they just see the green "Merge" button and
click it. At the same time, the status of the PR changed, and it
shouldn't be merged now, so the admin could send an unexpected force
merge.
In addition, I updated `ForceMerge *bool` to `ForceMerge bool`, I don't
see the reason to use a pointer.
And fixed the logic of CheckPullMergable to handle auto merge and force
merge correctly.
2 years ago
..
agit
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
asymkey
Refactor AssertExistsAndLoadBean to use generics ( #20797 )
2 years ago
attachment
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
auth
refactor auth interface to return error when verify failure ( #22119 ) ( #22259 )
2 years ago
automerge
Add force_merge to merge request and fix checking mergable ( #23010 ) ( #23032 )
2 years ago
comments
Move issues related files into models/issues ( #19931 )
2 years ago
context
Move almost all functions' parameter db.Engine to context.Context ( #19748 )
3 years ago
cron
Refactor git command arguments and make all arguments to be safe to be used ( #21535 )
2 years ago
externalaccount
Refactor auth package ( #17962 )
3 years ago
forms
Add force_merge to merge request and fix checking mergable ( #23010 ) ( #23032 )
2 years ago
gitdiff
Refactor git command arguments and make all arguments to be safe to be used ( #21535 )
2 years ago
issue
Fix issue not auto-closing when it includes a reference to a branch ( #22514 ) ( #22521 )
2 years ago
lfs
Prevent Authorization header for presigned LFS urls ( #21531 )
2 years ago
mailer
Prevent multiple `To` recipients ( #22566 ) ( #22569 )
2 years ago
markup
Link mentioned user in markdown only if they are visible to viewer ( #21554 )
2 years ago
migrations
Prevent duplicate labels when importing more than 99 ( #22591 ) ( #22598 )
2 years ago
mirror
Use proxy for pull mirror ( #22771 ) ( #22772 )
2 years ago
org
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
packages
refactor auth interface to return error when verify failure ( #22119 ) ( #22259 )
2 years ago
pull
Add force_merge to merge request and fix checking mergable ( #23010 ) ( #23032 )
2 years ago
release
Revert "Do not send notifications for draft releases ( #21451 )" ( #21594 )
2 years ago
repository
escape filename when assemble URL ( #22850 ) ( #22871 )
2 years ago
task
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
user
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
webhook
Fix wechatwork webhook sends empty content in PR review ( #21762 ) ( #22440 )
2 years ago
wiki
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) ( #21551 )
2 years ago
Jason Song
90982bffa5