Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
46689162
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,体验更适合开发者的 AI 搜索 >>
提交
46689162
编写于
11月 03, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure merge request's "remove branch" accessors return booleans
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
651bdd7c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
3 deletion
+20
-3
app/models/merge_request.rb
app/models/merge_request.rb
+2
-2
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+1
-0
changelogs/unreleased/24102-cannot-unselect-remove-source-branch-when-editing-merge-request.yml
...elect-remove-source-branch-when-editing-merge-request.yml
+4
-0
spec/features/merge_requests/edit_mr_spec.rb
spec/features/merge_requests/edit_mr_spec.rb
+13
-1
未找到文件。
app/models/merge_request.rb
浏览文件 @
46689162
...
...
@@ -441,11 +441,11 @@ class MergeRequest < ActiveRecord::Base
end
def
should_remove_source_branch?
merge_params
[
'should_remove_source_branch'
].
present?
Gitlab
::
Utils
.
to_boolean
(
merge_params
[
'should_remove_source_branch'
])
end
def
force_remove_source_branch?
merge_params
[
'force_remove_source_branch'
].
present?
Gitlab
::
Utils
.
to_boolean
(
merge_params
[
'force_remove_source_branch'
])
end
def
remove_source_branch?
...
...
app/views/shared/issuable/_form.html.haml
浏览文件 @
46689162
...
...
@@ -142,6 +142,7 @@
.col-sm-10.col-sm-offset-2
.checkbox
=
label_tag
'merge_request[force_remove_source_branch]'
do
=
hidden_field_tag
'merge_request[force_remove_source_branch]'
,
'0'
=
check_box_tag
'merge_request[force_remove_source_branch]'
,
'1'
,
@merge_request
.
force_remove_source_branch?
Remove source branch when merge request is accepted.
...
...
changelogs/unreleased/24102-cannot-unselect-remove-source-branch-when-editing-merge-request.yml
0 → 100644
浏览文件 @
46689162
---
title
:
Ensure merge request's "remove branch" accessors return booleans
merge_request
:
7267
author
:
spec/features/merge_requests/edit_mr_spec.rb
浏览文件 @
46689162
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
feature
'Edit Merge Request'
,
feature:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:
with_diffs
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:
simple
,
source_project:
project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
...
...
@@ -28,5 +28,17 @@ feature 'Edit Merge Request', feature: true do
expect
(
page
).
to
have_content
'Someone edited the merge request the same time you did'
end
it
'allows to unselect "Remove source branch"'
do
merge_request
.
update
(
merge_params:
{
'force_remove_source_branch'
=>
'1'
})
expect
(
merge_request
.
merge_params
[
'force_remove_source_branch'
]).
to
be_truthy
visit
edit_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
uncheck
'Remove source branch when merge request is accepted'
click_button
'Save changes'
expect
(
page
).
to
have_content
'Remove source branch'
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录