diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-08 01:39:11 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | 43da8db7ed63e40a32dce0a13347855d6f432d93 (patch) | |
| tree | 541327caae8d53127982fa0a0a86f6c74d360c9e | |
| parent | 3eeea426387e6959c576adde1978a12bfff59105 (diff) | |
| download | gitlab-ce-43da8db7ed63e40a32dce0a13347855d6f432d93.tar.gz | |
Clean up `discussions_to_resolve`-method
| -rw-r--r-- | app/services/issues/resolve_discussions.rb | 18 |
1 files 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 |