Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e5191254
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,发现更多精彩内容 >>
提交
e5191254
编写于
4月 16, 2019
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add project level config for merge train
We add the option and expose the parameter for frontend work
上级
a96e96d5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
1 deletion
+19
-1
db/migrate/20190416185130_add_merge_train_enabled_to_ci_cd_settings.rb
...190416185130_add_merge_train_enabled_to_ci_cd_settings.rb
+17
-0
db/schema.rb
db/schema.rb
+1
-0
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
未找到文件。
db/migrate/20190416185130_add_merge_train_enabled_to_ci_cd_settings.rb
0 → 100644
浏览文件 @
e5191254
# frozen_string_literal: true
class
AddMergeTrainEnabledToCiCdSettings
<
ActiveRecord
::
Migration
[
5.1
]
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column_with_default
:project_ci_cd_settings
,
:merge_trains_enabled
,
:boolean
,
default:
false
,
allow_null:
false
end
def
down
remove_column
:project_ci_cd_settings
,
:merge_trains_enabled
end
end
db/schema.rb
浏览文件 @
e5191254
...
...
@@ -1612,6 +1612,7 @@ ActiveRecord::Schema.define(version: 20190426180107) do
t
.
integer
"project_id"
,
null:
false
t
.
boolean
"group_runners_enabled"
,
default:
true
,
null:
false
t
.
boolean
"merge_pipelines_enabled"
t
.
boolean
"merge_trains_enabled"
,
default:
false
,
null:
false
t
.
index
[
"project_id"
],
name:
"index_project_ci_cd_settings_on_project_id"
,
unique:
true
,
using: :btree
end
...
...
spec/models/merge_request_spec.rb
浏览文件 @
e5191254
...
...
@@ -2123,7 +2123,7 @@ describe MergeRequest do
end
context
'when merges are not restricted to green builds'
do
subject
{
build
(
:merge_request
,
target_project:
build
(
:project
,
only_allow_merge_if_pipeline_succeeds:
false
))
}
subject
{
build
(
:merge_request
,
target_project:
create
(
:project
,
only_allow_merge_if_pipeline_succeeds:
false
))
}
context
'and a failed pipeline is associated'
do
before
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录