diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-02-19 05:02:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-03 11:14:31 +0100 |
| commit | afe5d7d209a4088d71e35d6382e6523b89f94ebe (patch) | |
| tree | a3432580bee64e1c9f30b0815426c31e3220d021 /app/services/issues/base_service.rb | |
| parent | 2f4656b5c7e2a9b351237432e76a7b928a1684b1 (diff) | |
| download | gitlab-ce-afe5d7d209a4088d71e35d6382e6523b89f94ebe.tar.gz | |
Issue #595: Support Slack notifications upon issue and merge request events
1) Adds a DB migration for all services to toggle on push, issue, and merge events.
2) Upon an issue or merge request event, fire service hooks.
3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.
4) Label merge request hooks with their corresponding actions.
Diffstat (limited to 'app/services/issues/base_service.rb')
| -rw-r--r-- | app/services/issues/base_service.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 755c0ef45a8..c3ca04a4343 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -1,13 +1,19 @@ module Issues class BaseService < ::IssuableBaseService - private - - def execute_hooks(issue, action = 'open') + def hook_data(issue, action) issue_data = issue.to_hook_data(current_user) issue_url = Gitlab::UrlBuilder.new(:issue).build(issue.id) issue_data[:object_attributes].merge!(url: issue_url, action: action) + issue_data + end + + private + + def execute_hooks(issue, action = 'open') + issue_data = hook_data(issue, action) issue.project.execute_hooks(issue_data, :issue_hooks) + issue.project.execute_services(issue_data, :issue_hooks) end end end |