1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 12:59:11 -05:00
forgejo/web_src/js/components
wxiaoguang e7b560f3fe
Fix the Manually Merged form (#23015)
Regression bug of #19650

Close #20983
Close #21912

### The "Manually Merged" form

![image](https://user-images.githubusercontent.com/2114189/220170503-32638994-b509-4251-8aa1-d8393dda7184.png)

### Mark a PR as Manually Merged and close it

![image](https://user-images.githubusercontent.com/2114189/220170537-25c91b2c-7a9a-44d1-9e6a-ebe3f1dfc26a.png)

---------

Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-02-21 18:03:41 +08:00
..
.eslintrc.yaml Fix eslint parsing errors, remove eslint-plugin-html (#20323) 2022-07-15 17:38:18 +08:00
ActivityHeatmap.vue JS refactors (#22227) 2022-12-24 00:03:11 +08:00
ContextPopup.vue Scoped labels (#22585) 2023-02-18 21:17:39 +02:00
DashboardRepoList.js Refactor from Vue2 to Vue3 (#20044) 2022-10-01 22:26:38 +08:00
DiffFileList.vue Move helpers to be prefixed with gt- (#22879) 2023-02-13 17:59:59 +00:00
DiffFileTree.vue Refactor hiding-methods, remove jQuery show/hide, remove .hide class, remove inline style=display:none (#22950) 2023-02-19 12:06:14 +08:00
DiffFileTreeItem.vue Add title to PR file tree items (#22918) 2023-02-16 00:57:25 -05:00
PullRequestMergeForm.vue Fix the Manually Merged form (#23015) 2023-02-21 18:03:41 +08:00
RepoActionView.vue Fix the full-height problem for all pages (#22905) 2023-02-14 21:04:22 +08:00
RepoActivityTopAuthors.vue Split index.js to separate files (#17315) 2021-10-17 01:28:04 +08:00
RepoBranchTagDropdown.js Refactor from Vue2 to Vue3 (#20044) 2022-10-01 22:26:38 +08:00
VueComponentLoader.js Update JS dependencies and eslint config (#21388) 2022-10-10 20:02:20 +08:00