kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move resolve_discussions_with_issue to Issues::CreateService

Browse source
This commit is contained in:
Bob Van Landuyt 2017-03-08 01:30:43 +01:00
parent 843092b631
commit 3eeea42638
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/services/issues/create_service.rb
View file

@ -25,6 +25,15 @@ module Issues
resolve_discussions_with_issue(issuable) resolve_discussions_with_issue(issuable)
end end
def resolve_discussions_with_issue(issue)
return if discussions_to_resolve.empty?
Discussions::ResolveService.new(project, current_user,
merge_request: merge_request_for_resolving_discussions,
follow_up_issue: issue).
execute(discussions_to_resolve)
end
private private
def user_agent_detail_service def user_agent_detail_service

9
app/services/issues/resolve_discussions.rb
View file

@ -7,15 +7,6 @@ module Issues
@discussion_to_resolve_id ||= params.delete(:discussion_to_resolve) @discussion_to_resolve_id ||= params.delete(:discussion_to_resolve)
end end
def resolve_discussions_with_issue(issue)
return if discussions_to_resolve.empty?
Discussions::ResolveService.new(project, current_user,
merge_request: merge_request_for_resolving_discussions,
follow_up_issue: issue).
execute(discussions_to_resolve)
end
def merge_request_for_resolving_discussions def merge_request_for_resolving_discussions
@merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: project.id). @merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: project.id).
execute. execute.