From c9339aec9edf5f69d6cbff6424b5f20702349dcd Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 13 Jul 2016 21:06:38 +0900
Subject: [PATCH] Fix error in creating and merging pull request

---
 src/main/twirl/gitbucket/core/pulls/compare.scala.html    | 2 +-
 src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index 00a619527..06632368e 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -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);
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index f9314ed24..713af11fb 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -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>