Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 12:36:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Naoki Takezoe
2016-07-14 02:21:42 +09:00
parent fff60b2704 c9339aec9e
commit 45d84f63c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/gitbucket/core/pulls/compare.scala.html
View File

@@ -166,7 +166,7 @@
}
}
}
<script><script>
<script>
$(function(){
$('a.origin-owner, a.forked-owner, a.origin-branch, a.forked-branch').click(function(){
var e = $(this);

2
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -133,7 +133,7 @@
}
</div>
<div id="confirm-merge-form" style="display: none; padding: 12px;">
<form method="POST" action="@helpers.url(originRepository)/pull/@pullreq.issueId/merge">
<form method="POST" action="@helpers.url(originRepository)/pull/@pullreq.issueId/merge" validate="true">
<div class="strong">
Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
</div>