2018-05-18 15:10:26 +00:00
|
|
|
#modal_merge_info.modal{ tabindex: '-1' }
|
2018-08-26 07:46:03 +00:00
|
|
|
.modal-dialog.modal-lg
|
2014-01-01 19:59:45 +00:00
|
|
|
.modal-content
|
|
|
|
.modal-header
|
2018-06-01 14:20:26 +00:00
|
|
|
%h3.modal-title Check out, review, and merge locally
|
2018-06-01 14:01:37 +00:00
|
|
|
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
|
|
|
|
%span{ "aria-hidden": true } ×
|
2014-01-01 19:59:45 +00:00
|
|
|
.modal-body
|
2015-08-10 12:13:26 +00:00
|
|
|
%p
|
2015-10-23 13:44:39 +00:00
|
|
|
%strong Step 1.
|
2015-08-10 12:13:26 +00:00
|
|
|
Fetch and check out the branch for this merge request
|
2017-04-06 21:10:14 +00:00
|
|
|
= clipboard_button(target: "pre#merge-info-1", title: "Copy commands to clipboard")
|
2015-12-15 21:11:01 +00:00
|
|
|
%pre.dark#merge-info-1
|
2015-08-10 12:13:26 +00:00
|
|
|
- if @merge_request.for_fork?
|
2014-01-01 19:59:45 +00:00
|
|
|
:preserve
|
2016-09-05 21:46:07 +00:00
|
|
|
git fetch #{h default_url_to_repo(@merge_request.source_project)} #{h @merge_request.source_branch}
|
2015-09-08 10:18:55 +00:00
|
|
|
git checkout -b #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} FETCH_HEAD
|
2015-08-10 12:13:26 +00:00
|
|
|
- else
|
2015-08-11 08:26:12 +00:00
|
|
|
:preserve
|
|
|
|
git fetch origin
|
2015-09-08 10:18:55 +00:00
|
|
|
git checkout -b #{h @merge_request.source_branch} origin/#{h @merge_request.source_branch}
|
2015-08-10 12:13:26 +00:00
|
|
|
%p
|
|
|
|
%strong Step 2.
|
|
|
|
Review the changes locally
|
|
|
|
|
|
|
|
%p
|
|
|
|
%strong Step 3.
|
|
|
|
Merge the branch and fix any conflicts that come up
|
2017-04-06 21:10:14 +00:00
|
|
|
= clipboard_button(target: "pre#merge-info-3", title: "Copy commands to clipboard")
|
2015-12-15 21:11:01 +00:00
|
|
|
%pre.dark#merge-info-3
|
2015-08-10 12:13:26 +00:00
|
|
|
- if @merge_request.for_fork?
|
|
|
|
:preserve
|
2018-08-30 04:50:00 +00:00
|
|
|
git fetch origin
|
|
|
|
git checkout origin/#{h @merge_request.target_branch}
|
2015-09-08 10:18:55 +00:00
|
|
|
git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch}
|
2015-08-10 12:13:26 +00:00
|
|
|
- else
|
2014-01-01 19:59:45 +00:00
|
|
|
:preserve
|
2018-08-30 04:50:00 +00:00
|
|
|
git fetch origin
|
|
|
|
git checkout origin/#{h @merge_request.target_branch}
|
2015-09-08 10:18:55 +00:00
|
|
|
git merge --no-ff #{h @merge_request.source_branch}
|
2015-08-10 12:13:26 +00:00
|
|
|
%p
|
|
|
|
%strong Step 4.
|
|
|
|
Push the result of the merge to GitLab
|
2017-04-06 21:10:14 +00:00
|
|
|
= clipboard_button(target: "pre#merge-info-4", title: "Copy commands to clipboard")
|
2015-12-15 21:11:01 +00:00
|
|
|
%pre.dark#merge-info-4
|
2015-08-10 12:13:26 +00:00
|
|
|
:preserve
|
2015-09-08 10:18:55 +00:00
|
|
|
git push origin #{h @merge_request.target_branch}
|
2015-08-10 12:13:26 +00:00
|
|
|
- unless @merge_request.can_be_merged_by?(current_user)
|
|
|
|
%p
|
|
|
|
Note that pushing to GitLab requires write access to this repository.
|
2016-01-21 21:09:44 +00:00
|
|
|
%p
|
|
|
|
%strong Tip:
|
2016-09-05 16:25:05 +00:00
|
|
|
= succeed '.' do
|
|
|
|
You can also checkout merge requests locally by
|
2017-05-18 06:38:34 +00:00
|
|
|
= link_to 'following these guidelines', help_page_path('user/project/merge_requests/index.md', anchor: "checkout-merge-requests-locally"), target: '_blank', rel: 'noopener noreferrer'
|