diff options
Diffstat (limited to 'app/services/merge_requests/toggle_attention_requested_service.rb')
| -rw-r--r-- | app/services/merge_requests/toggle_attention_requested_service.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/services/merge_requests/toggle_attention_requested_service.rb b/app/services/merge_requests/toggle_attention_requested_service.rb index d9f81ac310f..64cdcd725a2 100644 --- a/app/services/merge_requests/toggle_attention_requested_service.rb +++ b/app/services/merge_requests/toggle_attention_requested_service.rb @@ -18,12 +18,14 @@ module MergeRequests update_state(reviewer) update_state(assignee) + user.invalidate_attention_requested_count + if reviewer&.attention_requested? || assignee&.attention_requested? create_attention_request_note notity_user if current_user.id != user.id - remove_attention_requested(merge_request, current_user) + remove_attention_requested(merge_request) end else create_remove_attention_request_note @@ -59,7 +61,8 @@ module MergeRequests end def update_state(reviewer_or_assignee) - reviewer_or_assignee&.update(state: reviewer_or_assignee&.attention_requested? ? :reviewed : :attention_requested) + reviewer_or_assignee&.update(state: reviewer_or_assignee&.attention_requested? ? :reviewed : :attention_requested, + updated_state_by: current_user) end end end |