Fix merge guide to display ssh url

src/main/scala/gitbucket/core/controller/PullRequestsController.scala

@@ -183,7 +183,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           pullreq,
           statuses,
           repository,
-          s"${context.baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName, context.baseUrl).get)
       }
     } getOrElse NotFound
   })

src/main/twirl/gitbucket/core/admin/system.scala.html

@@ -280,9 +280,9 @@
           </div>
         </div>
       </div>
-      <fieldset>
+      <div class="align-right" style="margin-top: 20px;">
         <input type="submit" class="btn btn-success" value="Apply changes"/>
-      </fieldset>
+      </div>
     </form>
   }
 }

src/main/twirl/gitbucket/core/helper/copy.scala.html

@@ -1,5 +1,5 @@
-@(id: String, value: String)(html: Html)
-<div class="input-append" style="margin-bottom: 0px;">
+@(id: String, value: String, prepend: Boolean = false)(html: Html)
+<div class="input-append @if(prepend){input-prepend}" style="margin-bottom: 0px;">
   @html
   <span id="@id" class="add-on btn" data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
 </div>

src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html

@@ -3,8 +3,9 @@
   issue: gitbucket.core.model.Issue,
   pullreq: gitbucket.core.model.PullRequest,
   statuses: List[model.CommitStatus],
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  requestRepositoryUrl: String)(implicit context: gitbucket.core.controller.Context)
+  originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+  forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.service.SystemSettingsService
 @import context._
 @import gitbucket.core.view.helpers._
 @import model.CommitState
@@ -22,8 +23,9 @@
               @status.description.map{ desc => <span class="muted">— @desc</span> }
             </div>
             }
-          }else{
-            @defining(statuses.groupBy(_.state)){ stateMap => @defining(CommitState.combine(stateMap.keySet)){ state =>
+          } else {
+            @defining(statuses.groupBy(_.state)){ stateMap =>
+              @defining(CommitState.combine(stateMap.keySet)){ state =>
                 <div class="build-status-item">
                   <a class="pull-right" id="toggle-all-checks"></a>
                   <span class="build-status-icon text-@{state.name}">@commitStateIcon(state)</span>
@@ -40,30 +42,33 @@
                   </div>
                   }
                 </div>
-            } }
+              }
+            }
           }
         </div>
       }
-<div class="pull-right">
+      <div class="pull-right">
         <input type="button" class="btn @if(!hasProblem){ btn-success }" id="merge-pull-request-button" value="Merge pull request"@if(hasConflict){ disabled="true"}/>
-</div>
-<div>
+      </div>
+      <div>
         @if(hasConflict){
           <span class="strong">We can’t automatically merge this pull request.</span>
-  } else{ @if(hasProblem){
+        } else {
+          @if(hasProblem){
             <span class="strong">Merge with caution!</span>
           } else {
             <span class="strong">This pull request can be automatically merged.</span>
-  } }
-</div>
-<div class="small">
+          }
+        }
+      </div>
+      <div class="small">
         @if(hasConflict){
           <a href="#" id="show-command-line">Use the command line</a> to resolve conflicts before continuing.
         } else {
           You can also merge branches on the <a href="#" id="show-command-line">command line</a>.
         }
-</div>
-<div id="command-line" style="display: none;">
+      </div>
+      <div id="command-line" style="display: none;">
         <hr>
         @if(hasConflict){
           <span class="strong">Checkout via command line</span>
@@ -78,46 +83,41 @@
             you can perform a manual merge on the command line.
           </p>
         }
-  @helper.html.copy("repository-url-copy", requestRepositoryUrl){
-    <input type="text" style="width: 500px;" value="@requestRepositoryUrl" id="repository-url" readonly>
+        @helper.html.copy("repository-url-copy", forkedRepository.httpUrl, true){
+          <div class="btn-group" data-toggle="buttons-radio">
+            <button class="btn btn-small active" type="button" id="repository-url-http">HTTP</button>
+            @if(settings.ssh && loginAccount.isDefined){
+              <button class="btn btn-small" type="button" id="repository-url-ssh" style="border-radius: 0px;">SSH</button>
+            }
+          </div>
+          <input type="text" style="width: 500px;" value="@forkedRepository.httpUrl" id="repository-url" readonly>
         }
         <div>
           <p>
             <span class="strong">Step 1:</span> From your project repository, check out a new branch and test the changes.
           </p>
-    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\ngit pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
+          @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" +
+                    s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command =>
             @helper.html.copy("merge-command-copy-1", command){
-        <pre style="width: 500px; float: left;">@command</pre>
+              <pre style="width: 600px; float: left; font-size: 12px; border-radius: 3px 0px 3px 3px;" id="merge-command">@Html(command)</pre>
             }
           }
         </div>
-  @*
-  <div>
-    <p>
-      <span class="strong">Step 2:</span> Bring in @{pullreq.requestUserName}'s changes and test
-    </p>
-    @defining(s"git pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
-      @helper.html.copy("merge-command-copy-2", command){
-        <pre style="width: 500px; float: left;">@command</pre>
-      }
-    }
-  </div>
-  *@
         <div>
           <p>
             <span class="strong">Step 2:</span> Merge the changes and update on the server.
           </p>
-    @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
+          @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" +
+                    s"git push origin ${pullreq.branch}"){ command =>
             @helper.html.copy("merge-command-copy-2", command){
-        <pre style="width: 500px; float: left;">@command</pre>
+              <pre style="width: 600px; float: left; font-size: 12px; border-radius: 3px 0px 3px 3px;">@command</pre>
             }
           }
         </div>
-</div>
-
+      </div>
     </div>
     <div id="confirm-merge-form" style="display: none;">
-      <form method="POST" action="@url(repository)/pull/@pullreq.issueId/merge">
+      <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/merge">
         <div class="strong">
           Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
         </div>
@@ -151,5 +151,31 @@ $(function(){
     $('#merge-pull-request').hide();
     $('#confirm-merge-form').show();
   });
+
+  @if(settings.ssh && loginAccount.isDefined){
+    $('#repository-url-http').click(function(){
+      // Update URL box
+      $('#repository-url').val('@forkedRepository.httpUrl');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+      // Update command guidance
+      $('#merge-command').text($('#merge-command').text().replace(
+        '@forkedRepository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), loginAccount.get.userName)',
+        '@forkedRepository.httpUrl'
+      ));
+      $('#merge-command-copy-1').attr('data-clipboard-text', $('#merge-command').text());
+    });
+
+    $('#repository-url-ssh').click(function(){
+      // Update URL box
+      $('#repository-url').val('@forkedRepository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), loginAccount.get.userName)');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+      // Update command guidance
+      $('#merge-command').text($('#merge-command').text().replace(
+        '@forkedRepository.httpUrl',
+        '@forkedRepository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), loginAccount.get.userName)'
+      ));
+      $('#merge-command-copy-1').attr('data-clipboard-text', $('#merge-command').text());
+    });
+  }
 });
 </script>

src/main/twirl/gitbucket/core/settings/options.scala.html

@@ -91,9 +91,9 @@
           </div>
         </div>
         *@
-        <fieldset>
+        <div class="align-right" style="margin-top: 20px;">
           <input type="submit" class="btn btn-success" value="Apply changes"/>
-        </fieldset>
+        </div>
       </form>
     }
   }