Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
591f10f6
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,发现更多精彩内容 >>
提交
591f10f6
编写于
11月 11, 2016
作者:
A
Alejandro Rodríguez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update 8.14-rc1 migrations to minimize downtime and deploy time
See
https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
上级
67041e63
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
14 addition
and
5 deletion
+14
-5
app/models/project.rb
app/models/project.rb
+4
-0
db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb
...31004_only_allow_merge_if_all_discussions_are_resolved.rb
+1
-4
db/post_migrate/20161011222551_remove_inactive_jira_service_properties.rb
...20161011222551_remove_inactive_jira_service_properties.rb
+0
-0
db/schema.rb
db/schema.rb
+1
-1
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+8
-0
未找到文件。
app/models/project.rb
浏览文件 @
591f10f6
...
@@ -1334,6 +1334,10 @@ class Project < ActiveRecord::Base
...
@@ -1334,6 +1334,10 @@ class Project < ActiveRecord::Base
end
end
end
end
def
only_allow_merge_if_all_discussions_are_resolved
super
||
false
end
private
private
def
pushes_since_gc_redis_key
def
pushes_since_gc_redis_key
...
...
db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb
浏览文件 @
591f10f6
...
@@ -5,10 +5,7 @@ class OnlyAllowMergeIfAllDiscussionsAreResolved < ActiveRecord::Migration
...
@@ -5,10 +5,7 @@ class OnlyAllowMergeIfAllDiscussionsAreResolved < ActiveRecord::Migration
disable_ddl_transaction!
disable_ddl_transaction!
def
up
def
up
add_column_with_default
(
:projects
,
add_column
:projects
,
:only_allow_merge_if_all_discussions_are_resolved
,
:boolean
:only_allow_merge_if_all_discussions_are_resolved
,
:boolean
,
default:
false
)
end
end
def
down
def
down
...
...
db/migrate/20161011222551_remove_inactive_jira_service_properties.rb
→
db/
post_
migrate/20161011222551_remove_inactive_jira_service_properties.rb
浏览文件 @
591f10f6
文件已移动
db/schema.rb
浏览文件 @
591f10f6
...
@@ -912,7 +912,7 @@ ActiveRecord::Schema.define(version: 20161109150329) do
...
@@ -912,7 +912,7 @@ ActiveRecord::Schema.define(version: 20161109150329) do
t
.
boolean
"has_external_wiki"
t
.
boolean
"has_external_wiki"
t
.
boolean
"lfs_enabled"
t
.
boolean
"lfs_enabled"
t
.
text
"description_html"
t
.
text
"description_html"
t
.
boolean
"only_allow_merge_if_all_discussions_are_resolved"
,
default:
false
,
null:
false
t
.
boolean
"only_allow_merge_if_all_discussions_are_resolved"
end
end
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
...
...
spec/requests/api/projects_spec.rb
浏览文件 @
591f10f6
...
@@ -360,6 +360,14 @@ describe API::API, api: true do
...
@@ -360,6 +360,14 @@ describe API::API, api: true do
expect
(
json_response
[
'only_allow_merge_if_all_discussions_are_resolved'
]).
to
be_falsey
expect
(
json_response
[
'only_allow_merge_if_all_discussions_are_resolved'
]).
to
be_falsey
end
end
it
'sets a project as allowing merge if only_allow_merge_if_all_discussions_are_resolved is nil'
do
project
=
attributes_for
(
:project
,
only_allow_merge_if_all_discussions_are_resolved:
nil
)
post
api
(
'/projects'
,
user
),
project
expect
(
json_response
[
'only_allow_merge_if_all_discussions_are_resolved'
]).
to
be_falsey
end
it
'sets a project as allowing merge only if all discussions are resolved'
do
it
'sets a project as allowing merge only if all discussions are resolved'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_all_discussions_are_resolved:
true
})
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_all_discussions_are_resolved:
true
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录