diff options
| author | Judson Neer <judson.neer@gmail.com> | 2016-09-05 14:46:07 -0700 |
|---|---|---|
| committer | Judson Neer <judson.neer@gmail.com> | 2016-09-06 06:58:32 -0700 |
| commit | b5d4511cf587ad9a3dc8e885536498d6c6c4e2dd (patch) | |
| tree | 03a4f4b28d21ba9f20d89fa2e46e70a3f047ee3b | |
| parent | e9e8c67fb7d58288dbac1777b63ea7d3128d6268 (diff) | |
| download | gitlab-ce-b5d4511cf587ad9a3dc8e885536498d6c6c4e2dd.tar.gz | |
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.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_how_to_merge.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 982b4dd5e5a..41522857f82 100644 --- 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 diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml index 571e4dd1b1a..f1d5441f9dd 100644 --- 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 |