diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
| commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
| tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /lib/gitlab/hook_data | |
| parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb index 0678799b64b..ae2ec424ce5 100644 --- a/lib/gitlab/hook_data/merge_request_builder.rb +++ b/lib/gitlab/hook_data/merge_request_builder.rb @@ -23,7 +23,7 @@ module Gitlab milestone_id source_branch source_project_id - state + state_id target_branch target_project_id time_estimate @@ -53,7 +53,8 @@ module Gitlab human_total_time_spent: merge_request.human_total_time_spent, 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 + assignee_id: merge_request.assignee_ids.first, # This key is deprecated + state: merge_request.state # This key is deprecated } merge_request.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes) |