gitea

History

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
..
activity.go	Respect user's locale when rendering the date range in the repo activity page (#21410 )	2 years ago
attachment.go	Move some repository related code into sub package (#19711 )	3 years ago
blame.go	Refactor git command arguments and make all arguments to be safe to be used (#21535 )	2 years ago
branch.go	Prevent NPE if trying to restore an already restored deleted branch (#21940 ) (#21944 )	2 years ago
cherry_pick.go	Remove `RequireHighlightJS` field, update plantuml example. (#19615 )	3 years ago
commit.go	Use complete SHA to create and query commit status (#22244 ) (#22257 )	2 years ago
compare.go	Refactor git command arguments and make all arguments to be safe to be used (#21535 )	2 years ago
download.go	Slightly simplify LastCommitCache (#20444 )	2 years ago
editor.go	Move some files into models' sub packages (#20262 )	2 years ago
editor_test.go	Add more linters to improve code readability (#19989 )	3 years ago
find.go	Feature: Find files in repo (#15028 )	3 years ago
http.go	Refactor git command arguments and make all arguments to be safe to be used (#21535 )	2 years ago
http_test.go	Fix http path bug (#16117 )	4 years ago
issue.go	fix incorrect role labels for migrated issues and comments (#22914 ) (#22923 )	2 years ago
issue_content_history.go	Multiple improvements for comment edit diff (#21990 ) (#22007 )	2 years ago
issue_dependency.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_label.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_label_test.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_lock.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_stopwatch.go	Stop spurious APIFormat stopwatches logs (#20008 )	3 years ago
issue_test.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_timetrack.go	Move issues related files into models/issues (#19931 )	3 years ago
issue_watch.go	Move issues related files into models/issues (#19931 )	3 years ago
lfs.go	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551 )	2 years ago
main_test.go	Use a struct as test options (#19393 )	3 years ago
middlewares.go	Add system setting table with cache and also add cache supports for user setting (#18058 )	2 years ago
migrate.go	Unify repo settings & show better error (#19828 )	3 years ago
milestone.go	Move milestone to models/issues/ (#19278 )	3 years ago
packages.go	Show hint to link package to repo when viewing empty repo package list (#20504 )	2 years ago
patch.go	Remove `RequireHighlightJS` field, update plantuml example. (#19615 )	3 years ago
projects.go	Check if project has the same repository id with issue when assign project to issue (#20133 )	3 years ago
projects_test.go	Decouple unit test code from business code (#17623 )	3 years ago
pull.go	Add force_merge to merge request and fix checking mergable (#23010 ) (#23032 )	2 years ago
pull_review.go	Dismiss prior pull reviews if done via web in review dismiss (#20197 )	2 years ago
release.go	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551 )	2 years ago
release_test.go	Move some files into models' sub packages (#20262 )	2 years ago
render.go	Allow render HTML with css/js external links (#19017 )	3 years ago
repo.go	Add support for HEAD requests in Maven registry (#21834 ) (#21929 )	2 years ago
search.go	Add user/organization code search (#19977 )	2 years ago
setting.go	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551 )	2 years ago
setting_protected_branch.go	Move some code into models/git (#19879 )	3 years ago
settings_test.go	test: use `T.TempDir` to create temporary test directory (#21043 )	2 years ago
tag.go	Move some code into models/git (#19879 )	3 years ago
topic.go	Renamed ctx.User to ctx.Doer. (#19161 )	3 years ago
treelist.go	Refactor parseTreeEntries, speed up tree list (#21368 )	2 years ago
view.go	Ensure that plain files are rendered correctly even when containing ambiguous characters (#22017 ) (#22160 )	2 years ago
view_test.go	adapt README_{Country}.md stype name in localizedExtensions (#21486 )	2 years ago
webhook.go	Decouple HookTask from Repository (#17940 )	2 years ago
wiki.go	[refactor] Use const for wiki DefaultBranch (#21466 )	2 years ago
wiki_test.go	Make git.OpenRepository accept Context (#19260 )	3 years ago