kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'quote-branch-names-in-instructions' into 'master' 

Quote branch names in how to merge instructions

See merge request gitlab-org/gitlab-ce!32639
This commit is contained in:
Nick Thomas 2019-09-06 12:05:14 +00:00
parent bc06e9cd7e a8501a23b6
commit 222d9e62f2
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/projects/merge_requests/_how_to_merge.html.haml
View File

@ -13,12 +13,13 @@
%pre.dark#merge-info-1 %pre.dark#merge-info-1
- if @merge_request.for_fork? - if @merge_request.for_fork?
:preserve :preserve
git fetch #{h default_url_to_repo(@merge_request.source_project)} #{h @merge_request.source_branch} -# All repo/branch refs have been quoted to allow support for special characters (such as #my-branch)
git checkout -b #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} FETCH_HEAD 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 - else
:preserve :preserve
git fetch origin git fetch origin
git checkout -b #{h @merge_request.source_branch} origin/#{h @merge_request.source_branch} git checkout -b "#{h @merge_request.source_branch}" "origin/#{h @merge_request.source_branch}"
%p %p
%strong Step 2. %strong Step 2.
Review the changes locally Review the changes locally
@ -31,20 +32,20 @@
- if @merge_request.for_fork? - if @merge_request.for_fork?
:preserve :preserve
git fetch origin git fetch origin
git checkout origin/#{h @merge_request.target_branch} git checkout "origin/#{h @merge_request.target_branch}"
git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} git merge --no-ff "#{h @merge_request.source_project_path}-#{h @merge_request.source_branch}"
- else - else
:preserve :preserve
git fetch origin git fetch origin
git checkout origin/#{h @merge_request.target_branch} git checkout "origin/#{h @merge_request.target_branch}"
git merge --no-ff #{h @merge_request.source_branch} git merge --no-ff "#{h @merge_request.source_branch}"
%p %p
%strong Step 4. %strong Step 4.
Push the result of the merge to GitLab Push the result of the merge to GitLab
= clipboard_button(target: "pre#merge-info-4", title: "Copy commands to clipboard") = clipboard_button(target: "pre#merge-info-4", title: "Copy commands to clipboard")
%pre.dark#merge-info-4 %pre.dark#merge-info-4
:preserve :preserve
git push origin #{h @merge_request.target_branch} git push origin "#{h @merge_request.target_branch}"
- unless @merge_request.can_be_merged_by?(current_user) - unless @merge_request.can_be_merged_by?(current_user)
%p %p
Note that pushing to GitLab requires write access to this repository. Note that pushing to GitLab requires write access to this repository.

5
changelogs/unreleased/quote-branch-names-in-instructions.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Quote branch names in how to merge instructions
merge_request: 32639
author: Lee Tickett
type: fixed

2
spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
View File

@ -64,7 +64,7 @@ describe 'Merge request > User selects branches for new MR', :js do
click_button "Check out branch" click_button "Check out branch"
expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch' expect(page).to have_content 'git checkout -b "orphaned-branch" "origin/orphaned-branch"'
end end
it 'allows filtering multiple dropdowns' do it 'allows filtering multiple dropdowns' do