Change "check out, review, and merge locally" URL to use default clone protocol.

Using the default protocol here (vs HTTP only) is more convenient when it comes to pasting these commands into a terminal.

Change "check out, review, and merge locally" URL to use default clone protocol.
b5d4511c · Judson Neer · e9e8c67f · b5d4511c · b5d4511c
Commit b5d4511c authored Sep 05, 2016 by Judson Neer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

_how_to_merge.html.haml ...iews/projects/merge_requests/show/_how_to_merge.html.haml +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -89,6 +89,7 @@ v 8.12.0 (unreleased)
  - Fix error on raw build trace download for old builds stored in database !4822
  - Refactor the triggers page and documentation !6217
  - Show values of CI trigger variables only when clicked (Katarzyna Kobierska Ula Budziszewska)
+  - Use default clone protocol on "check out, review, and merge locally" help page URL

 v 8.11.5 (unreleased)
  - Optimize branch lookups and force a repository reload for Repository#find_branch

--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -12,7 +12,7 @@
        %pre.dark#merge-info-1
          - if @merge_request.for_fork?
            :preserve
-              git fetch #{h @merge_request.source_project.http_url_to_repo} #{h @merge_request.source_branch}
+              git fetch #{h default_url_to_repo(@merge_request.source_project)} #{h @merge_request.source_branch}
              git checkout -b #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} FETCH_HEAD
          - else
            :preserve