diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
| commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
| tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /lib/gitlab/hook_data | |
| parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) | |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'lib/gitlab/hook_data')
| -rw-r--r-- | lib/gitlab/hook_data/issue_builder.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/hook_data/merge_request_builder.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/hook_data/issue_builder.rb b/lib/gitlab/hook_data/issue_builder.rb index bd0603c5e5b..aacc3f8b821 100644 --- a/lib/gitlab/hook_data/issue_builder.rb +++ b/lib/gitlab/hook_data/issue_builder.rb @@ -11,6 +11,7 @@ module Gitlab time_change severity escalation_status + customer_relations_contacts ].freeze end @@ -56,7 +57,8 @@ module Gitlab assignee_id: issue.assignee_ids.first, # This key is deprecated labels: issue.labels_hook_attrs, state: issue.state, - severity: issue.severity + severity: issue.severity, + customer_relations_contacts: issue.customer_relations_contacts.map(&:hook_attrs) } if issue.supports_escalation? && issue.escalation_status diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb index a6ca8323a20..22af06ba09b 100644 --- a/lib/gitlab/hook_data/merge_request_builder.rb +++ b/lib/gitlab/hook_data/merge_request_builder.rb @@ -10,6 +10,7 @@ module Gitlab blocking_discussions_resolved created_at description + draft head_pipeline_id id iid @@ -55,6 +56,7 @@ module Gitlab target: merge_request.target_project.hook_attrs, last_commit: merge_request.diff_head_commit&.hook_attrs, work_in_progress: merge_request.draft?, + draft: merge_request.draft?, total_time_spent: merge_request.total_time_spent, time_change: merge_request.time_change, human_total_time_spent: merge_request.human_total_time_spent, |