Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c22e51e8
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,发现更多精彩内容 >>
提交
c22e51e8
编写于
6月 08, 2018
作者:
A
Athar Hameed
提交者:
Sean McGivern
6月 08, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "Automatically created MR uses wrong target branch (when branching from Tag)"
上级
f068479e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
4 deletion
+16
-4
app/services/merge_requests/create_from_issue_service.rb
app/services/merge_requests/create_from_issue_service.rb
+3
-1
changelogs/unreleased/45400-automatically-created-mr-uses-wrong-target-branch-when-branching-from-tag.yml
...d-mr-uses-wrong-target-branch-when-branching-from-tag.yml
+5
-0
spec/services/merge_requests/create_from_issue_service_spec.rb
...services/merge_requests/create_from_issue_service_spec.rb
+8
-3
未找到文件。
app/services/merge_requests/create_from_issue_service.rb
浏览文件 @
c22e51e8
...
...
@@ -41,7 +41,9 @@ module MergeRequests
end
def
ref
@ref
||
project
.
default_branch
||
'master'
return
@ref
if
project
.
repository
.
branch_exists?
(
@ref
)
project
.
default_branch
||
'master'
end
def
merge_request
...
...
changelogs/unreleased/45400-automatically-created-mr-uses-wrong-target-branch-when-branching-from-tag.yml
0 → 100644
浏览文件 @
c22e51e8
---
title
:
Set MR target branch to default branch if target branch is not valid
merge_request
:
19067
author
:
type
:
fixed
spec/services/merge_requests/create_from_issue_service_spec.rb
浏览文件 @
c22e51e8
...
...
@@ -125,9 +125,14 @@ describe MergeRequests::CreateFromIssueService do
end
context
'when ref branch does not exist'
do
it
'does not create a merge request'
do
expect
{
described_class
.
new
(
project
,
user
,
issue_iid:
issue
.
iid
,
ref:
'nobr'
).
execute
}
.
not_to
change
{
project
.
merge_requests
.
count
}
subject
{
described_class
.
new
(
project
,
user
,
issue_iid:
issue
.
iid
,
ref:
'no-such-branch'
).
execute
}
it
'creates a merge request'
do
expect
{
subject
}.
to
change
(
project
.
merge_requests
,
:count
).
by
(
1
)
end
it
'sets the merge request target branch to the project default branch'
do
expect
(
subject
[
:merge_request
].
target_branch
).
to
eq
(
project
.
default_branch
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录