Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a45a2d47
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,发现更多精彩内容 >>
提交
a45a2d47
编写于
7月 05, 2017
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backport Service changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
上级
491110d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
14 deletion
+24
-14
app/models/service.rb
app/models/service.rb
+8
-0
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+11
-10
app/views/shared/_service_settings.html.haml
app/views/shared/_service_settings.html.haml
+5
-4
未找到文件。
app/models/service.rb
浏览文件 @
a45a2d47
...
...
@@ -51,6 +51,14 @@ class Service < ActiveRecord::Base
active
end
def
show_active_box?
true
end
def
editable?
true
end
def
template?
template
end
...
...
app/views/projects/services/_form.html.haml
浏览文件 @
a45a2d47
...
...
@@ -11,16 +11,17 @@
.col-lg-9
=
form_for
(
@service
,
as: :service
,
url:
namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'gl-show-field-errors form-horizontal js-integration-settings-form'
,
data:
{
'can-test'
=>
@service
.
can_test?
,
'test-url'
=>
test_namespace_project_service_path
}
})
do
|
form
|
=
render
'shared/service_settings'
,
form:
form
,
subject:
@service
.footer-block.row-content-block
%button
.btn.btn-save
{
type:
'submit'
}
=
icon
(
'spinner spin'
,
class:
'hidden js-btn-spinner'
)
%span
.js-btn-label
Save changes
-
if
@service
.
valid?
&&
@service
.
activated?
-
unless
@service
.
can_test?
-
disabled_class
=
'disabled'
-
disabled_title
=
@service
.
disabled_title
-
if
@service
.
editable?
.footer-block.row-content-block
%button
.btn.btn-save
{
type:
'submit'
}
=
icon
(
'spinner spin'
,
class:
'hidden js-btn-spinner'
)
%span
.js-btn-label
Save changes
-
if
@service
.
valid?
&&
@service
.
activated?
-
unless
@service
.
can_test?
-
disabled_class
=
'disabled'
-
disabled_title
=
@service
.
disabled_title
=
link_to
'Cancel'
,
namespace_project_settings_integrations_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-cancel'
...
...
app/views/shared/_service_settings.html.haml
浏览文件 @
a45a2d47
...
...
@@ -7,10 +7,11 @@
=
markdown
@service
.
help
.service-settings
.form-group
=
form
.
label
:active
,
"Active"
,
class:
"control-label"
.col-sm-10
=
form
.
check_box
:active
-
if
@service
.
show_active_box?
.form-group
=
form
.
label
:active
,
"Active"
,
class:
"control-label"
.col-sm-10
=
form
.
check_box
:active
-
if
@service
.
supported_events
.
present?
.form-group
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录