BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5e405bfe
Commit
5e405bfe
authored
Mar 17, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update methods that use issue close service
`Issues::CloseService#execute` signature has changed, because of using keyword parameter for commmit.
parent
e3d32ff0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
git_push_service.rb
app/services/git_push_service.rb
+1
-1
close_service.rb
app/services/issues/close_service.rb
+1
-1
post_merge_service.rb
app/services/merge_requests/post_merge_service.rb
+1
-1
No files found.
app/services/git_push_service.rb
View file @
5e405bfe
...
...
@@ -120,7 +120,7 @@ class GitPushService < BaseService
closed_issues
=
commit
.
closes_issues
(
current_user
)
closed_issues
.
each
do
|
issue
|
if
can?
(
current_user
,
:update_issue
,
issue
)
Issues
::
CloseService
.
new
(
project
,
authors
[
commit
],
{}).
execute
(
issue
,
commit
)
Issues
::
CloseService
.
new
(
project
,
authors
[
commit
],
{}).
execute
(
issue
,
commit
:
commit
)
end
end
end
...
...
app/services/issues/close_service.rb
View file @
5e405bfe
module
Issues
class
CloseService
<
Issues
::
BaseService
def
execute
(
issue
,
commit
=
nil
,
notifications:
true
,
system_note:
true
)
def
execute
(
issue
,
commit
:
nil
,
notifications:
true
,
system_note:
true
)
if
project
.
jira_tracker?
&&
project
.
jira_service
.
active
project
.
jira_service
.
execute
(
commit
,
issue
)
todo_service
.
close_issue
(
issue
,
current_user
)
...
...
app/services/merge_requests/post_merge_service.rb
View file @
5e405bfe
...
...
@@ -22,7 +22,7 @@ module MergeRequests
closed_issues
=
merge_request
.
closes_issues
(
current_user
)
closed_issues
.
each
do
|
issue
|
if
can?
(
current_user
,
:update_issue
,
issue
)
Issues
::
CloseService
.
new
(
project
,
current_user
,
{}).
execute
(
issue
,
merge_request
)
Issues
::
CloseService
.
new
(
project
,
current_user
,
{}).
execute
(
issue
,
commit:
merge_request
)
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