Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
a103a5d9
Commit
a103a5d9
authored
Aug 30, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to confidential issues events to trigger Webhooks
parent
debb65b5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
12 deletions
+37
-12
app/controllers/projects/hooks_controller.rb
app/controllers/projects/hooks_controller.rb
+1
-0
app/models/hooks/web_hook.rb
app/models/hooks/web_hook.rb
+1
-0
app/views/projects/hooks/_project_hook.html.haml
app/views/projects/hooks/_project_hook.html.haml
+1
-1
app/views/shared/web_hooks/_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+7
-0
db/migrate/20160830203109_add_confidential_issues_events_to_web_hooks.rb
...0830203109_add_confidential_issues_events_to_web_hooks.rb
+15
-0
db/schema.rb
db/schema.rb
+12
-11
No files found.
app/controllers/projects/hooks_controller.rb
View file @
a103a5d9
...
@@ -59,6 +59,7 @@ class Projects::HooksController < Projects::ApplicationController
...
@@ -59,6 +59,7 @@ class Projects::HooksController < Projects::ApplicationController
:pipeline_events
,
:pipeline_events
,
:enable_ssl_verification
,
:enable_ssl_verification
,
:issues_events
,
:issues_events
,
:confidential_issues_events
,
:merge_requests_events
,
:merge_requests_events
,
:note_events
,
:note_events
,
:push_events
,
:push_events
,
...
...
app/models/hooks/web_hook.rb
View file @
a103a5d9
...
@@ -4,6 +4,7 @@ class WebHook < ActiveRecord::Base
...
@@ -4,6 +4,7 @@ class WebHook < ActiveRecord::Base
default_value_for
:push_events
,
true
default_value_for
:push_events
,
true
default_value_for
:issues_events
,
false
default_value_for
:issues_events
,
false
default_value_for
:confidential_issues_events
,
false
default_value_for
:note_events
,
false
default_value_for
:note_events
,
false
default_value_for
:merge_requests_events
,
false
default_value_for
:merge_requests_events
,
false
default_value_for
:tag_push_events
,
false
default_value_for
:tag_push_events
,
false
...
...
app/views/projects/hooks/_project_hook.html.haml
View file @
a103a5d9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.col-md-8.col-lg-7
.col-md-8.col-lg-7
%strong
.light-header
=
hook
.
url
%strong
.light-header
=
hook
.
url
%div
%div
-
%w(push_events tag_push_events issues_events note_events merge_requests_events build_events pipeline_events wiki_page_events)
.
each
do
|
trigger
|
-
%w(push_events tag_push_events issues_events
confidential_issues_events
note_events merge_requests_events build_events pipeline_events wiki_page_events)
.
each
do
|
trigger
|
-
if
hook
.
send
(
trigger
)
-
if
hook
.
send
(
trigger
)
%span
.label.label-gray.deploy-project-label
=
trigger
.
titleize
%span
.label.label-gray.deploy-project-label
=
trigger
.
titleize
.col-md-4.col-lg-5.text-right-lg.prepend-top-5
.col-md-4.col-lg-5.text-right-lg.prepend-top-5
...
...
app/views/shared/web_hooks/_form.html.haml
View file @
a103a5d9
...
@@ -51,6 +51,13 @@
...
@@ -51,6 +51,13 @@
%strong
Issues events
%strong
Issues events
%p
.light
%p
.light
This URL will be triggered when an issue is created/updated/merged
This URL will be triggered when an issue is created/updated/merged
%li
=
f
.
check_box
:confidential_issues_events
,
class:
'pull-left'
.prepend-left-20
=
f
.
label
:confidential_issues_events
,
class:
'list-label'
do
%strong
Confidential Issues events
%p
.light
This URL will be triggered when a confidential issue is created/updated/merged
%li
%li
=
f
.
check_box
:merge_requests_events
,
class:
'pull-left'
=
f
.
check_box
:merge_requests_events
,
class:
'pull-left'
.prepend-left-20
.prepend-left-20
...
...
db/migrate/20160830203109_add_confidential_issues_events_to_web_hooks.rb
0 → 100644
View file @
a103a5d9
class
AddConfidentialIssuesEventsToWebHooks
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column_with_default
:web_hooks
,
:confidential_issues_events
,
:boolean
,
default:
false
,
allow_null:
false
end
def
down
remove_column
:web_hooks
,
:confidential_issues_events
end
end
db/schema.rb
View file @
a103a5d9
...
@@ -1113,22 +1113,23 @@ ActiveRecord::Schema.define(version: 20160830232601) do
...
@@ -1113,22 +1113,23 @@ ActiveRecord::Schema.define(version: 20160830232601) do
add_index
"users_star_projects"
,
[
"user_id"
],
name:
"index_users_star_projects_on_user_id"
,
using: :btree
add_index
"users_star_projects"
,
[
"user_id"
],
name:
"index_users_star_projects_on_user_id"
,
using: :btree
create_table
"web_hooks"
,
force: :cascade
do
|
t
|
create_table
"web_hooks"
,
force: :cascade
do
|
t
|
t
.
string
"url"
,
limit:
2000
t
.
string
"url"
,
limit:
2000
t
.
integer
"project_id"
t
.
integer
"project_id"
t
.
datetime
"created_at"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
t
.
string
"type"
,
default:
"ProjectHook"
t
.
string
"type"
,
default:
"ProjectHook"
t
.
integer
"service_id"
t
.
integer
"service_id"
t
.
boolean
"push_events"
,
default:
true
,
null:
false
t
.
boolean
"push_events"
,
default:
true
,
null:
false
t
.
boolean
"issues_events"
,
default:
false
,
null:
false
t
.
boolean
"issues_events"
,
default:
false
,
null:
false
t
.
boolean
"merge_requests_events"
,
default:
false
,
null:
false
t
.
boolean
"merge_requests_events"
,
default:
false
,
null:
false
t
.
boolean
"tag_push_events"
,
default:
false
t
.
boolean
"tag_push_events"
,
default:
false
t
.
boolean
"note_events"
,
default:
false
,
null:
false
t
.
boolean
"note_events"
,
default:
false
,
null:
false
t
.
boolean
"enable_ssl_verification"
,
default:
true
t
.
boolean
"enable_ssl_verification"
,
default:
true
t
.
boolean
"build_events"
,
default:
false
,
null:
false
t
.
boolean
"build_events"
,
default:
false
,
null:
false
t
.
boolean
"wiki_page_events"
,
default:
false
,
null:
false
t
.
boolean
"wiki_page_events"
,
default:
false
,
null:
false
t
.
string
"token"
t
.
string
"token"
t
.
boolean
"pipeline_events"
,
default:
false
,
null:
false
t
.
boolean
"pipeline_events"
,
default:
false
,
null:
false
t
.
boolean
"confidential_issues_events"
,
default:
false
,
null:
false
end
end
add_index
"web_hooks"
,
[
"project_id"
],
name:
"index_web_hooks_on_project_id"
,
using: :btree
add_index
"web_hooks"
,
[
"project_id"
],
name:
"index_web_hooks_on_project_id"
,
using: :btree
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment