diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-17 13:25:52 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (patch) | |
| tree | 25367a69b4a529335e106d0d65c2d9a38e97f092 /app/services/concerns | |
| parent | 80b2e18fb62b8da7410f90b3e5340b9e63e765a3 (diff) | |
| download | gitlab-ce-79889a6aa3dc878d196d0f2f445ab6b10ef10c74.tar.gz | |
Add specs
Diffstat (limited to 'app/services/concerns')
| -rw-r--r-- | app/services/concerns/issues/resolve_discussions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/concerns/issues/resolve_discussions.rb b/app/services/concerns/issues/resolve_discussions.rb index 378967f0231..910a2a15e5d 100644 --- a/app/services/concerns/issues/resolve_discussions.rb +++ b/app/services/concerns/issues/resolve_discussions.rb @@ -21,7 +21,7 @@ module Issues @discussions_to_resolve ||= if discussion_to_resolve_id discussion_or_nil = merge_request_to_resolve_discussions_of - .find_diff_discussion(discussion_to_resolve_id) + .find_discussion(discussion_to_resolve_id) Array(discussion_or_nil) else merge_request_to_resolve_discussions_of |