Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 08:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #810)Some fix about pull request

Browse Source
This commit is contained in:
Naoki Takezoe
2015-07-28 11:12:11 +09:00
parent ed05422ea8
commit 96a3f2c301
4 changed files with 15 additions and 25 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

@@ -139,7 +139,7 @@ $(function(){
}
@if(hasWritePermission){
function checkConflict(from, to, noConflictHandler, hasConflictHandler){
function checkConflict(from, to){
$('.check-conflict').show();
$.get('@url(repository)/compare/' + from + '...' + to + '/mergecheck',
function(data){ $('.check-conflict').html(data); });