Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/gitlab/hook_data/issuable_builder.rb b/lib/gitlab/hook_data/issuable_builder.rb
index 5c8aa5050ed..c4e27bf424f 100644
--- a/lib/gitlab/hook_data/issuable_builder.rb
+++ b/lib/gitlab/hook_data/issuable_builder.rb
@@ -13,7 +13,7 @@ module Gitlab
           event_type: event_type,
           user: user.hook_attrs,
           project: issuable.project.hook_attrs,
-          object_attributes: issuable.hook_attrs,
+          object_attributes: issuable_builder.new(issuable).build,
           labels: issuable.labels.map(&:hook_attrs),
           changes: final_changes(changes.slice(*safe_keys)),
           # DEPRECATED
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb
index aaca16d8d7c..06ddd65d075 100644
--- a/lib/gitlab/hook_data/merge_request_builder.rb
+++ b/lib/gitlab/hook_data/merge_request_builder.rb
@@ -60,6 +60,7 @@ 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
+          labels: merge_request.labels_hook_attrs,
           state: merge_request.state, # This key is deprecated
           blocking_discussions_resolved: merge_request.mergeable_discussions_state?
         }