Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
99caa5bb
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,发现更多精彩内容 >>
未验证
提交
99caa5bb
编写于
2月 27, 2018
作者:
T
Tomasz Maczukin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use ChronicDurationAttribute to handle CI/CD timeout setting
上级
b15dd5df
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
13 deletion
+12
-13
app/controllers/projects/pipelines_settings_controller.rb
app/controllers/projects/pipelines_settings_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/models/project.rb
app/models/project.rb
+7
-8
app/views/projects/pipelines_settings/_show.html.haml
app/views/projects/pipelines_settings/_show.html.haml
+3
-3
未找到文件。
app/controllers/projects/pipelines_settings_controller.rb
浏览文件 @
99caa5bb
...
...
@@ -36,7 +36,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
def
update_params
params
.
require
(
:project
).
permit
(
:runners_token
,
:builds_enabled
,
:build_allow_git_fetch
,
:build_timeout_
in_minutes
,
:build_coverage_regex
,
:public_builds
,
:build_timeout_
human_readable
,
:build_coverage_regex
,
:public_builds
,
:auto_cancel_pending_pipelines
,
:ci_config_path
,
auto_devops_attributes:
[
:id
,
:domain
,
:enabled
]
)
...
...
app/controllers/projects_controller.rb
浏览文件 @
99caa5bb
...
...
@@ -324,7 +324,7 @@ class ProjectsController < Projects::ApplicationController
:avatar
,
:build_allow_git_fetch
,
:build_coverage_regex
,
:build_timeout_
in_minutes
,
:build_timeout_
human_readable
,
:resolve_outdated_diff_discussions
,
:container_registry_enabled
,
:default_branch
,
...
...
app/models/project.rb
浏览文件 @
99caa5bb
...
...
@@ -21,6 +21,7 @@ class Project < ActiveRecord::Base
include
Gitlab
::
SQL
::
Pattern
include
DeploymentPlatform
include
::
Gitlab
::
Utils
::
StrongMemoize
include
ChronicDurationAttribute
extend
Gitlab
::
ConfigHelper
...
...
@@ -325,6 +326,12 @@ class Project < ActiveRecord::Base
enum
auto_cancel_pending_pipelines:
{
disabled:
0
,
enabled:
1
}
chronic_duration_attr
:build_timeout_human_readable
,
:build_timeout
validates
:build_timeout
,
allow_nil:
true
,
numericality:
{
greater_than_or_equal_to:
600
,
message:
'needs to be at least 10 minutes'
}
# Returns a collection of projects that is either public or visible to the
# logged in user.
def
self
.
public_or_visible_to_user
(
user
=
nil
)
...
...
@@ -1299,14 +1306,6 @@ class Project < ActiveRecord::Base
self
.
runners_token
&&
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
token
,
self
.
runners_token
)
end
def
build_timeout_in_minutes
build_timeout
/
60
end
def
build_timeout_in_minutes
=
(
value
)
self
.
build_timeout
=
value
.
to_i
*
60
end
def
open_issues_count
Projects
::
OpenIssuesCountService
.
new
(
self
).
count
end
...
...
app/views/projects/pipelines_settings/_show.html.haml
浏览文件 @
99caa5bb
...
...
@@ -73,10 +73,10 @@
%hr
.form-group
=
f
.
label
:build_timeout_
in_minutes
,
'Timeout'
,
class:
'label-light'
=
f
.
number_field
:build_timeout_in_minutes
,
class:
'form-control'
,
min:
'0
'
=
f
.
label
:build_timeout_
human_readable
,
'Timeout'
,
class:
'label-light'
=
f
.
text_field
:build_timeout_human_readable
,
class:
'form-control
'
%p
.help-block
Per job
in minutes
. If a job passes this threshold, it will be marked as failed
Per job. If a job passes this threshold, it will be marked as failed
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/pipelines/settings'
,
anchor:
'timeout'
),
target:
'_blank'
%hr
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录