diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 15:12:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 15:12:41 +0300 |
| commit | 0512d12bf15a0fc9b3ca29d7c854b34058d931a9 (patch) | |
| tree | 210175512668ba59edc163a0c45d3d91c74f37b8 /lib/gitlab/hook_data | |
| parent | 94ecc00f47df7051eea905a5899053bf476e0589 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/hook_data')
| -rw-r--r-- | lib/gitlab/hook_data/merge_request_builder.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb index db807a3c557..0e787a77a25 100644 --- a/lib/gitlab/hook_data/merge_request_builder.rb +++ b/lib/gitlab/hook_data/merge_request_builder.rb @@ -7,6 +7,7 @@ module Gitlab %i[ assignee_id author_id + blocking_discussions_resolved created_at description head_pipeline_id @@ -57,7 +58,8 @@ module Gitlab human_time_estimate: merge_request.human_time_estimate, assignee_ids: merge_request.assignee_ids, assignee_id: merge_request.assignee_ids.first, # This key is deprecated - state: merge_request.state # This key is deprecated + state: merge_request.state, # This key is deprecated + blocking_discussions_resolved: merge_request.mergeable_discussions_state? } merge_request.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes) |