From 92b35bd458c037cf28b85514eccd9ceaa9c868f9 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Fri, 12 Jul 2019 01:05:24 +0900
Subject: [PATCH] Fix code formatting

---
 .../core/service/PullRequestService.scala     |  1 -
 .../gitbucket/core/pulls/compare.scala.html   | 37 +++++++++----------
 .../core/pulls/conversation.scala.html        |  2 +-
 .../core/pulls/mergeguide.scala.html          | 22 +++++------
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala
index 2323bab5f..05d771f9b 100644
--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -225,7 +225,6 @@ trait PullRequestService {
 
   /**
    * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
-   *
    */
   def updatePullRequests(owner: String, repository: String, branch: String, loginAccount: Account, action: String)(
     implicit s: Session,
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index 4018b29e5..cd4a24468 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -80,26 +80,23 @@
                 style              = "height: 200px;"
               )
               <div class="text-right">
-              <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
-              <input type="hidden" name="targetBranch" value="@originId"/>
-              <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
-              <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
-              <input type="hidden" name="requestBranch" value="@forkedId"/>
-              <input type="hidden" name="commitIdFrom" value="@sourceId"/>
-              <input type="hidden" name="commitIdTo" value="@commitId"/>
-               <input type="hidden" id="is-draft" name="isDraft" value=false />
-
-<!--                <input type="submit" class="btn btn-success" value="Create pull request"/>-->
-<!--                formaction="@context.path/@originRepository.owner/@originRepository.name/pulls/new"-->
-                <div class="btn-group dropup">
-                <input type="submit" class="btn btn-success" tabindex="2" value="Create pull request" id="submit-button" validate="true" formaction="@context.path/@originRepository.owner/@originRepository.name/pulls/new"/>
-                <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu dropdown-menu-right">
-                  <li><a id="pull-request">Create pull request</a></li>
-                  <li><a id="draft-request">Create draft request</a></li>
-                </ul>
+                <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
+                <input type="hidden" name="targetBranch" value="@originId"/>
+                <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
+                <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
+                <input type="hidden" name="requestBranch" value="@forkedId"/>
+                <input type="hidden" name="commitIdFrom" value="@sourceId"/>
+                <input type="hidden" name="commitIdTo" value="@commitId"/>
+                <input type="hidden" id="is-draft" name="isDraft" value=false />
+                <div class="btn-group dropdown">
+                  <input type="submit" class="btn btn-success" tabindex="2" value="Create pull request" id="submit-button" validate="true" formaction="@context.path/@originRepository.owner/@originRepository.name/pulls/new"/>
+                  <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu dropdown-menu-right">
+                    <li><a id="pull-request">Create pull request</a></li>
+                    <li><a id="draft-request">Create draft request</a></li>
+                  </ul>
                 </div>
               </div>
             </div>
diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index 09d6c5682..3cc395ab5 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -1,4 +1,4 @@
- @(issue: gitbucket.core.model.Issue,
+@(issue: gitbucket.core.model.Issue,
   pullreq: gitbucket.core.model.PullRequest,
   commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
   comments: Seq[gitbucket.core.model.Comment],
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index bea6a73e8..8ee25305d 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -79,23 +79,23 @@
 
         @if(pullreq.isDraft){
           <span class="strong">This pull request is still a work in progress.</span>
-        <div class="pull-right">
-          <input type="button" class="btn btn-default" value="Ready for review" id="ready-for-review" />
-        </div>
+          <div class="pull-right">
+            <input type="button" class="btn btn-default" value="Ready for review" id="ready-for-review" />
+          </div>
           <div class="small">
             Draft pull requests cannot be merged.
           </div>
         } else {
             @if(status.hasMergePermission){
-                  <span class="strong">Merging can be performed automatically.</span>
-                  <div class="small">
-                  Merging can be performed automatically.
-                 </div>
+              <span class="strong">Merging can be performed automatically.</span>
+              <div class="small">
+                Merging can be performed automatically.
+              </div>
             } else {
-                    <span class="strong">This branch has no conflicts with the base branch.</span>
-                    <div class="small">
-                      Only those with write access to this repository can merge pull requests.
-                    </div>
+              <span class="strong">This branch has no conflicts with the base branch.</span>
+              <div class="small">
+                Only those with write access to this repository can merge pull requests.
+              </div>
             }
            }
           }