Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dd785467
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 搜索 >>
未验证
提交
dd785467
编写于
11月 08, 2017
作者:
A
Alexis Reigel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
project#group_runner_enabled -> project_settings
上级
a2a7ad29
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
19 deletion
+30
-19
app/controllers/projects/runners_controller.rb
app/controllers/projects/runners_controller.rb
+1
-1
app/models/project.rb
app/models/project.rb
+5
-0
db/migrate/20170925142221_add_group_runners_enabled_to_projects.rb
...e/20170925142221_add_group_runners_enabled_to_projects.rb
+0
-16
db/migrate/20171030155459_create_project_settings.rb
db/migrate/20171030155459_create_project_settings.rb
+2
-0
db/schema.rb
db/schema.rb
+2
-1
spec/factories/projects.rb
spec/factories/projects.rb
+8
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+12
-0
未找到文件。
app/controllers/projects/runners_controller.rb
浏览文件 @
dd785467
...
...
@@ -53,7 +53,7 @@ class Projects::RunnersController < Projects::ApplicationController
end
def
toggle_group_runners
project
.
toggle!
(
:group_runners_enabled
)
project
.
toggle
_settings
!
(
:group_runners_enabled
)
redirect_to
project_settings_ci_cd_path
(
@project
)
end
...
...
app/models/project.rb
浏览文件 @
dd785467
...
...
@@ -249,6 +249,7 @@ class Project < ActiveRecord::Base
delegate
:members
,
to: :team
,
prefix:
true
delegate
:add_user
,
:add_users
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_master
,
:add_role
,
to: :team
delegate
:group_runners_enabled
,
:group_runners_enabled
=
,
:group_runners_enabled?
,
to: :settings
# Validations
validates
:creator
,
presence:
true
,
on: :create
...
...
@@ -1893,6 +1894,10 @@ class Project < ActiveRecord::Base
[]
end
def
toggle_settings!
(
settings_attribute
)
settings
.
toggle!
(
settings_attribute
)
end
private
def
storage
...
...
db/migrate/20170925142221_add_group_runners_enabled_to_projects.rb
已删除
100644 → 0
浏览文件 @
a2a7ad29
class
AddGroupRunnersEnabledToProjects
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column_with_default
:projects
,
:group_runners_enabled
,
:boolean
,
default:
true
add_concurrent_index
:projects
,
:group_runners_enabled
end
def
down
remove_column
:projects
,
:group_runners_enabled
end
end
db/migrate/20171030155459_create_project_settings.rb
浏览文件 @
dd785467
...
...
@@ -7,6 +7,8 @@ class CreateProjectSettings < ActiveRecord::Migration
def
change
create_table
:project_settings
do
|
t
|
t
.
references
:project
,
index:
true
,
foreign_key:
{
on_delete: :cascade
}
t
.
boolean
:group_runners_enabled
,
default:
true
,
index:
true
end
end
end
db/schema.rb
浏览文件 @
dd785467
...
...
@@ -1506,8 +1506,10 @@ ActiveRecord::Schema.define(version: 20180418053107) do
create_table
"project_settings"
,
force: :cascade
do
|
t
|
t
.
integer
"project_id"
t
.
boolean
"group_runners_enabled"
,
default:
true
end
add_index
"project_settings"
,
[
"group_runners_enabled"
],
name:
"index_project_settings_on_group_runners_enabled"
,
using: :btree
add_index
"project_settings"
,
[
"project_id"
],
name:
"index_project_settings_on_project_id"
,
using: :btree
create_table
"project_statistics"
,
force: :cascade
do
|
t
|
...
...
@@ -1581,7 +1583,6 @@ ActiveRecord::Schema.define(version: 20180418053107) do
add_index
"projects"
,
[
"created_at"
],
name:
"index_projects_on_created_at"
,
using: :btree
add_index
"projects"
,
[
"creator_id"
],
name:
"index_projects_on_creator_id"
,
using: :btree
add_index
"projects"
,
[
"description"
],
name:
"index_projects_on_description_trigram"
,
using: :gin
,
opclasses:
{
"description"
=>
"gin_trgm_ops"
}
add_index
"projects"
,
[
"group_runners_enabled"
],
name:
"index_projects_on_group_runners_enabled"
,
using: :btree
add_index
"projects"
,
[
"id"
],
name:
"index_projects_on_id_partial_for_visibility"
,
unique:
true
,
where:
"(visibility_level = ANY (ARRAY[10, 20]))"
,
using: :btree
add_index
"projects"
,
[
"last_activity_at"
],
name:
"index_projects_on_last_activity_at"
,
using: :btree
add_index
"projects"
,
[
"last_repository_check_failed"
],
name:
"index_projects_on_last_repository_check_failed"
,
using: :btree
...
...
spec/factories/projects.rb
浏览文件 @
dd785467
...
...
@@ -15,14 +15,18 @@ FactoryBot.define do
namespace
creator
{
group
?
create
(
:user
)
:
namespace
&
.
owner
}
# Nest Project Feature attributes
transient
do
# Nest Project Feature attributes
wiki_access_level
ProjectFeature
::
ENABLED
builds_access_level
ProjectFeature
::
ENABLED
snippets_access_level
ProjectFeature
::
ENABLED
issues_access_level
ProjectFeature
::
ENABLED
merge_requests_access_level
ProjectFeature
::
ENABLED
repository_access_level
ProjectFeature
::
ENABLED
# we can't assign the delegated `#settings` attributes directly, as the
# `#settings` relation needs to be created first
group_runners_enabled
nil
end
after
(
:create
)
do
|
project
,
evaluator
|
...
...
@@ -47,6 +51,9 @@ FactoryBot.define do
end
project
.
group
&
.
refresh_members_authorized_projects
# assign the delegated `#settings` attributes after create
project
.
reload
.
group_runners_enabled
=
evaluator
.
group_runners_enabled
unless
evaluator
.
group_runners_enabled
.
nil?
end
trait
:public
do
...
...
spec/models/project_spec.rb
浏览文件 @
dd785467
...
...
@@ -3640,4 +3640,16 @@ describe Project do
it
{
is_expected
.
not_to
be_valid
}
end
end
describe
'#toggle_settings!'
do
it
'toggles the value on #settings'
do
project
=
create
:project
,
group_runners_enabled:
false
expect
(
project
.
group_runners_enabled
).
to
be
false
project
.
toggle_settings!
(
:group_runners_enabled
)
expect
(
project
.
group_runners_enabled
).
to
be
true
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录