Clean up `discussions_to_resolve`-method

43da8db7 · Bob Van Landuyt · 3eeea426 · 43da8db7
Commit 43da8db7 authored Mar 08, 2017 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

app/services/issues/resolve_discussions.rb app/services/issues/resolve_discussions.rb +9 -9

No files found.
--- 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
+      @discussions_to_resolve ||=
        if discussion_to_resolve_id
-                                      Array(merge_request_for_resolving_discussions.
+          discussion_or_nil = merge_request_for_resolving_discussions
-                                              find_diff_discussion(discussion_to_resolve_id))
+                                .find_diff_discussion(discussion_to_resolve_id)
+          Array(discussion_or_nil)
        else
          merge_request_for_resolving_discussions
            .resolvable_discussions
        end
    end
  end
-  end
 end