forked from gitea/gitea
1
0
Fork 0
gitea/web_src/js
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.
2023-02-21 09:42:22 -06:00
..
components Add force_merge to merge request and fix checking mergable (#23010) (#23032) 2023-02-21 09:42:22 -06:00
features Escape path for the file list (#22741) (#22757) 2023-02-06 12:58:06 +00:00
markup Fix environments for KaTeX and error reporting (#22453) (#22473) 2023-01-16 13:34:50 -06:00
modules Improve commit status icons (#21124) 2022-09-09 17:03:18 -04:00
standalone Add new JS linter rules (#17699) 2021-11-22 16:19:01 +08:00
test Switch from jest to vitest (#21444) 2022-10-14 21:36:16 +08:00
bootstrap.js Quick fixes monaco-editor error: "vs.editor.nullLanguage" (#21734) (#21738) 2022-11-09 21:19:44 +08:00
index.js Add system setting table with cache and also add cache supports for user setting (#18058) 2022-10-17 07:29:26 +08:00
jquery.js Upgrade jQuery to 3.5.0, remove jQuery-Migrate, fix deprecations (#11055) 2020-04-18 18:46:29 -04:00
serviceworker.js Fix serviceworker output file and misc improvements (#11562) 2020-05-24 08:36:40 +01:00
svg.js Multiple improvements for comment edit diff (#21990) (#22007) 2022-12-02 15:42:41 -05:00
svg.test.js Remove vitest globals (#21505) 2022-10-19 14:50:19 +08:00
utils.js Use weighted algorithm for string matching when finding files in repo (#21370) 2022-10-08 12:22:44 +01:00
utils.test.js Remove vitest globals (#21505) 2022-10-19 14:50:19 +08:00