diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-02 14:22:57 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-02 14:22:57 +0000 |
| commit | 453bcfb3f34b61f94c51d8c5e8de4f2ae6ee309c (patch) | |
| tree | 5e26cf6a84965e5b785009587087f2c264f17d37 /app/services/merge_requests | |
| parent | 191f461b88ba80069c2b23229cc0e26253d4fcc7 (diff) | |
| parent | f40478fe194113722d5db5e066acde37a7cdbd85 (diff) | |
| download | gitlab-ce-453bcfb3f34b61f94c51d8c5e8de4f2ae6ee309c.tar.gz | |
Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'
Bump Ruby on Rails to 5.0.7.1
See merge request gitlab-org/gitlab-ce!23396
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 33d8299c8b6..86a04587f79 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -46,11 +46,13 @@ module MergeRequests end if merge_request.previous_changes.include?('assignee_id') + reassigned_merge_request_args = [merge_request, current_user] + old_assignee_id = merge_request.previous_changes['assignee_id'].first - old_assignee = User.find(old_assignee_id) if old_assignee_id + reassigned_merge_request_args << User.find(old_assignee_id) if old_assignee_id create_assignee_note(merge_request) - notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignee) + notification_service.async.reassigned_merge_request(*reassigned_merge_request_args) todo_service.reassigned_merge_request(merge_request, current_user) end |