thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions
forgejo/templates/repo
History
Markus Amshove b1d66f50fb
Disallow merge when required checked are missing (#29143) 
fixes #21892

This PR disallows merging a PR when not all commit status contexts
configured in the branch protection are met.

Previously, the PR was happy to merge when one commit status was
successful and the other contexts weren't reported.

Any feedback is welcome, first time Go :-)
I'm also not sure if the changes in the template break something else

Given the following branch protection:

![branch_protection](https://github.com/go-gitea/gitea/assets/2401875/f871b4e4-138b-435a-b496-f9ad432e3dec)

This was shown before the change:

![before](https://github.com/go-gitea/gitea/assets/2401875/60424ff0-ee09-4fa0-856e-64e6e3fb0612)

With the change, it is now shown as this:

![after](https://github.com/go-gitea/gitea/assets/2401875/4e464142-efb1-4889-8166-eb3be26c8f3d)

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit a11ccc9fcd61fb25ffb1c37b87a0df4ee9efd84e)
2024-02-19 22:58:33 +01:00
..
actions Fix the runs will not be displayed bug when the main branch have no workflows but other branches have (#28359) 2023-12-06 01:13:59 +00:00
branch Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
cite Update JS and PY dependencies (#27501) 2023-10-08 00:16:20 +00:00
code [GITEA] Rework when recently pushed branches are displayed 2024-02-05 16:09:43 +01:00
diff Clean up diff header css and reduce global textarea min-height (#29232) 2024-02-19 22:58:33 +01:00
editor Refactor locale&string&template related code (#29165) 2024-02-16 15:20:52 +01:00
find Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
graph Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
issue Disallow merge when required checked are missing (#29143) 2024-02-19 22:58:33 +01:00
migrate Merge branch 'rebase-forgejo-dependency' into wip-forgejo 2024-02-05 18:58:23 +01:00
projects Use full width for project boards (#28225) 2023-11-27 17:43:52 +00:00
pulls Disallow merge when required checked are missing (#29143) 2024-02-19 22:58:33 +01:00
release [gitea] Hide code links on release page if user cannot read code (#29064) 2024-02-10 10:53:42 +01:00
settings Use "Safe" modifier for manually constructed safe HTML strings in templates (#29227) 2024-02-19 22:58:32 +01:00
tag Fix more "locale" usages (#27259) 2023-09-25 20:42:40 +08:00
wiki [GITEA] Add cancel button to wiki 2024-02-05 16:09:40 +01:00
activity.tmpl Implement contributors graph (#27882) 2024-02-17 23:24:31 +01:00
admin_flags.tmpl [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
blame.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
branch_dropdown.tmpl [gitea] Rework spellchecking, add lint-spell (#29106) 2024-02-10 10:53:43 +01:00
clone_buttons.tmpl Fix more "locale" usages (#27259) 2023-09-25 20:42:40 +08:00
clone_script.tmpl [GITEA] Configurable clone methods 2024-02-05 16:09:42 +01:00
commit_load_branches_and_tags.tmpl Wrap contained tags and branches again (#29021) 2024-02-02 04:51:09 +00:00
commit_page.tmpl Clean up diff header css and reduce global textarea min-height (#29232) 2024-02-19 22:58:33 +01:00
commit_status.tmpl Restore warning commit status (#27504) 2023-10-08 22:16:06 +00:00
commit_statuses.tmpl Add Hide/Show all checks button to commit status check (#26284) 2023-11-02 14:49:02 +00:00
commits.tmpl [GITEA] Detect file rename and show in history 2024-02-05 16:09:40 +01:00
commits_list.tmpl Show View at this point in history for every commit (#29122) 2024-02-14 21:44:24 +01:00
commits_list_small.tmpl Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
commits_table.tmpl Fix more "locale" usages (#27259) 2023-09-25 20:42:40 +08:00
contributors.tmpl De-duplicate contributor graph translations (#29247) 2024-02-19 22:58:33 +01:00
create.tmpl Add support for sha256 repositories (#23894) 2024-01-19 17:05:02 +01:00
create_helper.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
empty.tmpl Fix more "locale" usages (#27259) 2023-09-25 20:42:40 +08:00
file_info.tmpl Show in Web UI if file is vendored and generated (#28620) 2024-01-24 13:51:37 +08:00
flags.tmpl [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
forks.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
graph.tmpl Fix more "locale" usages (#27259) 2023-09-25 20:42:40 +08:00
header.tmpl Tweak repo header (#29134) 2024-02-17 23:24:30 +01:00
home.tmpl [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
icon.tmpl Tweak repo header (#29134) 2024-02-17 23:24:30 +01:00
latest_commit.tmpl Show latest commit for file (#28067) 2024-01-15 17:42:15 +01:00
navbar.tmpl Implement contributors graph (#27882) 2024-02-17 23:24:31 +01:00
packages.tmpl
pulse.tmpl Implement contributors graph (#27882) 2024-02-17 23:24:31 +01:00
release_tag_header.tmpl Improve RSS feed icons (#28368) 2023-12-06 20:29:26 +00:00
search.tmpl Fix 500 error of searching commits (#28576) 2023-12-21 23:09:14 +00:00
search_name.tmpl
shabox_badge.tmpl cleanup locale function usage (#27227) 2023-09-24 20:31:58 +00:00
star_unstar.tmpl Don't do a full page load when clicking Watch or Star (#29001) 2024-02-05 09:56:20 +00:00
sub_menu.tmpl Enable followCursor for language stats bar (#27713) 2023-10-22 13:06:04 +00:00
unicode_escape_prompt.tmpl Fix incorrect button CSS usages (#29015) 2024-02-01 21:28:50 +00:00
upload.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
user_cards.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
view_file.tmpl [GITEA] Disable the RSS feed in file view for non-branches 2024-02-05 16:09:42 +01:00
view_list.tmpl Show latest commit for file (#28067) 2024-01-15 17:42:15 +01:00
watch_unwatch.tmpl Don't do a full page load when clicking Watch or Star (#29001) 2024-02-05 09:56:20 +00:00
watchers.tmpl