Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a8501a23
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a8501a23
编写于
9月 06, 2019
作者:
L
Lee Tickett
提交者:
Nick Thomas
9月 06, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Quote branch names in how to merge instructions
上级
bc06e9cd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
9 deletion
+15
-9
app/views/projects/merge_requests/_how_to_merge.html.haml
app/views/projects/merge_requests/_how_to_merge.html.haml
+9
-8
changelogs/unreleased/quote-branch-names-in-instructions.yml
changelogs/unreleased/quote-branch-names-in-instructions.yml
+5
-0
spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
...es/merge_request/user_selects_branches_for_new_mr_spec.rb
+1
-1
未找到文件。
app/views/projects/merge_requests/_how_to_merge.html.haml
浏览文件 @
a8501a23
...
...
@@ -13,12 +13,13 @@
%pre
.dark
#merge-info-1
-
if
@merge_request
.
for_fork?
:preserve
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
-# All repo/branch refs have been quoted to allow support for special characters (such as #my-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
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
%strong
Step 2.
Review the changes locally
...
...
@@ -31,20 +32,20 @@
-
if
@merge_request
.
for_fork?
:preserve
git fetch origin
git checkout
origin/
#{
h
@merge_request
.
target_branch
}
git merge --no-ff
#{
h
@merge_request
.
source_project_path
}
-
#{
h
@merge_request
.
source_branch
}
git checkout
"origin/
#{
h
@merge_request
.
target_branch
}
"
git merge --no-ff
"
#{
h
@merge_request
.
source_project_path
}
-
#{
h
@merge_request
.
source_branch
}
"
-
else
:preserve
git fetch origin
git checkout
origin/
#{
h
@merge_request
.
target_branch
}
git merge --no-ff
#{
h
@merge_request
.
source_branch
}
git checkout
"origin/
#{
h
@merge_request
.
target_branch
}
"
git merge --no-ff
"
#{
h
@merge_request
.
source_branch
}
"
%p
%strong
Step 4.
Push the result of the merge to GitLab
=
clipboard_button
(
target:
"pre#merge-info-4"
,
title:
"Copy commands to clipboard"
)
%pre
.dark
#merge-info-4
: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
)
%p
Note that pushing to GitLab requires write access to this repository.
...
...
changelogs/unreleased/quote-branch-names-in-instructions.yml
0 → 100644
浏览文件 @
a8501a23
---
title
:
Quote branch names in how to merge instructions
merge_request
:
32639
author
:
Lee Tickett
type
:
fixed
spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
浏览文件 @
a8501a23
...
...
@@ -64,7 +64,7 @@ describe 'Merge request > User selects branches for new MR', :js do
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
it
'allows filtering multiple dropdowns'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录