Nemcio/Gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-02 20:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix checks in PR for empty commits #19603 (#20290)

Browse Source 
* Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id)
* fill HeadCommitID in PullRequest
* compare real commits ID as check for merging
* based on @zeripath patch in #19738
This commit is contained in:
Ing. Jaroslav Šafka
2022-07-13 10:22:51 +02:00
committed by GitHub
parent b7c6ec91ba
commit 8420c1bf4c
7 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web_src/js/components/PullRequestMergeForm.vue
View File

@@ -48,7 +48,7 @@
<div v-if="!showActionForm" class="df">
<!-- the merge button -->
<div class="ui buttons merge-button" :class="mergeButtonStyleClass" @click="toggleActionForm(true)" >
<div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'green' : 'red']" @click="toggleActionForm(true)" >
<button class="ui button">
<svg-icon name="octicon-git-merge"/>
<span class="button-text">