From 43da8db7ed63e40a32dce0a13347855d6f432d93 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Wed, 8 Mar 2017 01:39:11 +0100 Subject: Clean up `discussions_to_resolve`-method --- app/services/issues/resolve_discussions.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/issues/resolve_discussions.rb b/app/services/issues/resolve_discussions.rb index b7daa3f2916..47fd334a9b2 100644 --- a/app/services/issues/resolve_discussions.rb +++ b/app/services/issues/resolve_discussions.rb @@ -16,15 +16,15 @@ module Issues def discussions_to_resolve return [] unless merge_request_for_resolving_discussions - @discussions_to_resolve ||= begin - if discussion_to_resolve_id - Array(merge_request_for_resolving_discussions. - find_diff_discussion(discussion_to_resolve_id)) - else - merge_request_for_resolving_discussions - .resolvable_discussions - end - end + @discussions_to_resolve ||= + if discussion_to_resolve_id + discussion_or_nil = merge_request_for_resolving_discussions + .find_diff_discussion(discussion_to_resolve_id) + Array(discussion_or_nil) + else + merge_request_for_resolving_discussions + .resolvable_discussions + end end end end -- cgit v1.2.1