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
Tatuya Kamada
gitlab-ce
Commits
3eeea426
Commit
3eeea426
authored
Mar 08, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move `resolve_discussions_with_issue` to `Issues::CreateService`
parent
843092b6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/services/issues/create_service.rb
app/services/issues/create_service.rb
+9
-0
app/services/issues/resolve_discussions.rb
app/services/issues/resolve_discussions.rb
+0
-9
No files found.
app/services/issues/create_service.rb
View file @
3eeea426
...
...
@@ -25,6 +25,15 @@ module Issues
resolve_discussions_with_issue
(
issuable
)
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
def
user_agent_detail_service
...
...
app/services/issues/resolve_discussions.rb
View file @
3eeea426
...
...
@@ -7,15 +7,6 @@ module Issues
@discussion_to_resolve_id
||=
params
.
delete
(
:discussion_to_resolve
)
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
@merge_request_for_resolving_discussions
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
project
.
id
).
execute
.
...
...
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