Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-04 06:32:56 +02:00
Code Issues Activity

Merge branch 'main' into add-file-tree-to-file-view-page

Browse Source
This commit is contained in:
Kerwin Bryant
2025-01-03 13:52:57 +08:00
committed by GitHub
parent 91ffb2d720 68972a9947
commit b1b24282ae
266 changed files with 4462 additions and 3471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web_src/js/components/PullRequestMergeForm.vue
+1 -1
View File
@@ -147,7 +147,7 @@ function clearMergeMessage() {
</template>
</span>
</button>
<div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1">
<div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu">
<svg-icon name="octicon-triangle-down" :size="14"/>
<div class="menu" :class="{'show':showMergeStyleMenu}">
<template v-for="msd in mergeForm.mergeStyles">