diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-09 15:56:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-09 15:56:42 +0000 |
| commit | bc7c6dde9ae3dcf0e2a0d7fe8f6afc912cacc87c (patch) | |
| tree | 3e77c6d08786700ccb50d2f15686d49cb3aa5d98 /app/services/issues | |
| parent | 11c67e7c2f992299ff5918ce67995b73d1e0be6d (diff) | |
| parent | f070265a6ddd0173c8924bfcd7791ecafa15ab7e (diff) | |
| download | gitlab-ce-bc7c6dde9ae3dcf0e2a0d7fe8f6afc912cacc87c.tar.gz | |
Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'
Include the changes in issuable webhook payloads
Closes #34284
See merge request gitlab-org/gitlab-ce!14308
Diffstat (limited to 'app/services/issues')
| -rw-r--r-- | app/services/issues/base_service.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 4c198fc96ea..735257c4779 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -1,10 +1,10 @@ module Issues class BaseService < ::IssuableBaseService - def hook_data(issue, action) - issue_data = issue.to_hook_data(current_user) - issue_url = Gitlab::UrlBuilder.build(issue) - issue_data[:object_attributes].merge!(url: issue_url, action: action) - issue_data + def hook_data(issue, action, old_labels: [], old_assignees: []) + hook_data = issue.to_hook_data(current_user, old_labels: old_labels, old_assignees: old_assignees) + hook_data[:object_attributes][:action] = action + + hook_data end def reopen_service @@ -22,8 +22,8 @@ module Issues issue, issue.project, current_user, old_assignees) end - def execute_hooks(issue, action = 'open') - issue_data = hook_data(issue, action) + def execute_hooks(issue, action = 'open', old_labels: [], old_assignees: []) + issue_data = hook_data(issue, action, old_labels: old_labels, old_assignees: old_assignees) hooks_scope = issue.confidential? ? :confidential_issue_hooks : :issue_hooks issue.project.execute_hooks(issue_data, hooks_scope) issue.project.execute_services(issue_data, hooks_scope) |