diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-21 18:13:07 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-24 13:08:25 +0100 |
| commit | ba62143ac34de6cf96da4a19b498b220f7e5154b (patch) | |
| tree | dd2aaad55176397c82c8fe9498cf9d98ae868092 /app/services/merge_requests/update_service.rb | |
| parent | 7c1e54d58d7ee0308b865d9563f1dfeb54568e16 (diff) | |
| download | gitlab-ce-ba62143ac34de6cf96da4a19b498b220f7e5154b.tar.gz | |
Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architecture
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 1f394cacc64..c153872c874 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -22,8 +22,9 @@ module MergeRequests end def handle_changes(merge_request, options) - old_labels = options[:old_labels] || [] - old_mentioned_users = options[:old_mentioned_users] || [] + old_associations = options.fetch(:old_associations, {}) + old_labels = old_associations.fetch(:labels, []) + old_mentioned_users = old_associations.fetch(:mentioned_users, []) if has_changes?(merge_request, old_labels: old_labels) todo_service.mark_pending_todos_as_done(merge_request, current_user) |