Add option to confidential issues events to trigger Webhooks
This commit is contained in:
parent
debb65b5c8
commit
a103a5d9cc
|
|
@ -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,
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
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
|
||||||
|
|
@ -1129,6 +1129,7 @@ ActiveRecord::Schema.define(version: 20160830232601) do
|
||||||
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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue