Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
00ced598
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 搜索 >>
提交
00ced598
编写于
4月 30, 2016
作者:
G
Gabriel Mazetto
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added UI to define secret_token for webhook and systemhook
Codestyle changes to easy EE merge
上级
0cd5edf3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
6 deletion
+31
-6
app/controllers/admin/hooks_controller.rb
app/controllers/admin/hooks_controller.rb
+7
-1
app/controllers/projects/hooks_controller.rb
app/controllers/projects/hooks_controller.rb
+11
-3
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+8
-2
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+5
-0
未找到文件。
app/controllers/admin/hooks_controller.rb
浏览文件 @
00ced598
...
...
@@ -39,6 +39,12 @@ class Admin::HooksController < Admin::ApplicationController
end
def
hook_params
params
.
require
(
:hook
).
permit
(
:url
,
:enable_ssl_verification
,
:push_events
,
:tag_push_events
)
params
.
require
(
:hook
).
permit
(
:enable_ssl_verification
,
:push_events
,
:tag_push_events
,
:token
,
:url
)
end
end
app/controllers/projects/hooks_controller.rb
浏览文件 @
00ced598
...
...
@@ -52,8 +52,16 @@ class Projects::HooksController < Projects::ApplicationController
end
def
hook_params
params
.
require
(
:hook
).
permit
(
:url
,
:push_events
,
:issues_events
,
:merge_requests_events
,
:tag_push_events
,
:note_events
,
:build_events
,
:enable_ssl_verification
)
params
.
require
(
:hook
).
permit
(
:build_events
,
:enable_ssl_verification
,
:issues_events
,
:merge_requests_events
,
:note_events
,
:push_events
,
:tag_push_events
,
:token
,
:url
)
end
end
app/views/admin/hooks/index.html.haml
浏览文件 @
00ced598
...
...
@@ -13,9 +13,15 @@
=
form_errors
(
@hook
)
.form-group
=
f
.
label
:url
,
"URL:"
,
class:
'control-label'
=
f
.
label
:url
,
'URL'
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:url
,
class:
"form-control"
=
f
.
text_field
:url
,
class:
'form-control'
.form-group
=
f
.
label
:token
,
'Secret Token'
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:token
,
class:
'form-control'
%p
.help-block
Use this token to validate received payloads
.form-group
=
f
.
label
:url
,
"Trigger"
,
class:
'control-label'
.col-sm-10.prepend-top-10
...
...
app/views/projects/hooks/index.html.haml
浏览文件 @
00ced598
...
...
@@ -15,6 +15,11 @@
.form-group
=
f
.
label
:url
,
"URL"
,
class:
"label-light"
=
f
.
text_field
:url
,
class:
"form-control"
,
placeholder:
"http://example.com/trigger-ci.json"
.form-group
=
f
.
label
:token
,
"Secret Token"
,
class:
'label-light'
=
f
.
text_field
:token
,
class:
"form-control"
,
placeholder:
''
%p
.help-block
Use this token to validate received payloads
.form-group
=
f
.
label
:url
,
"Trigger"
,
class:
"label-light"
%div
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录