Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-06 23:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow to create pull request from default branch of forked repositories (#3339)

Browse Source
This commit is contained in:
Naoki Takezoe
2023-08-13 01:48:23 +09:00
committed by GitHub
parent d43a666dfc
commit 8ada3dde04
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/twirl/gitbucket/core/repo/branches.scala.html
View File

@@ -46,7 +46,7 @@
</td>
<td class="text-right">
<div class="branch-action">
@if(repository.repository.defaultBranch != branch.name){
@if(repository.repository.defaultBranch != branch.name || repository.repository.originUserName.isDefined){
@branch.mergeInfo.map{ info =>
@prs.map{ case (pull, issue) =>
<a href="@helpers.url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
@@ -76,13 +76,14 @@
}
@if(hasWritePermission){
<span style="margin-left: 8px;">
@if(prs.map(!_._2.closed).getOrElse(false)){
@if(prs.exists(!_._2.closed)){
<a class="disabled" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="octicon octicon-trashcan"></i></a>
} else {
@if(isProtected){
@if(isProtected || repository.repository.defaultBranch == branch.name) {
<a class="disabled" data-toggle="tooltip" title="You can’t delete a protected branch."><i class="octicon octicon-trashcan"></i></a>
} else {
<a href="@helpers.url(repository)/delete/@helpers.encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
<a href="@helpers.url(repository)/delete/@helpers.encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged) {
data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged) {warning} else {danger}"></i></a>
}
}
</span>
@@ -99,7 +100,7 @@
<script>
$(function(){
$('.delete-branch').click(function(e){
var branchName = $(e.target).closest('a').data('name');
const branchName = $(e.target).closest('a').data('name');
return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
});
$('*[data-toggle=tooltip]').tooltip().css("white-space","nowrap");