Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ef86353e
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,发现更多精彩内容 >>
提交
ef86353e
编写于
3月 20, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed source branch name not being in new merge request dropdown toggle
Closes #29660
上级
691402fb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
1 deletion
+7
-1
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+1
-1
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+6
-0
未找到文件。
app/views/projects/merge_requests/_new_compare.html.haml
浏览文件 @
ef86353e
...
...
@@ -21,7 +21,7 @@
selected:
f
.
object
.
source_project_id
.merge-request-select.dropdown
=
f
.
hidden_field
:source_branch
=
dropdown_toggle
local_assigns
.
fetch
(
f
.
object
.
source_branch
,
"Select source branch"
)
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
=
dropdown_toggle
f
.
object
.
source_branch
||
"Select source branch"
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
.dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
=
dropdown_title
(
"Select source branch"
)
=
dropdown_filter
(
"Search branches"
)
...
...
spec/features/merge_requests/create_new_mr_spec.rb
浏览文件 @
ef86353e
...
...
@@ -46,6 +46,12 @@ feature 'Create New Merge Request', feature: true, js: true do
end
end
it
'populates source branch button'
do
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
change_branches:
true
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'fix'
})
expect
(
find
(
'.js-source-branch'
)).
to
have_content
(
'fix'
)
end
it
'allows to change the diff view'
do
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'fix'
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录