Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
43da8db7
Commit
43da8db7
authored
Mar 08, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up `discussions_to_resolve`-method
parent
3eeea426
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app/services/issues/resolve_discussions.rb
app/services/issues/resolve_discussions.rb
+9
-9
No files found.
app/services/issues/resolve_discussions.rb
View file @
43da8db7
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment