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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
87c29cfa
Commit
87c29cfa
authored
Jun 20, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move JIRA issue processing to CloseService
parent
b4523ebb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
app/services/git_push_service.rb
app/services/git_push_service.rb
+1
-5
app/services/issues/close_service.rb
app/services/issues/close_service.rb
+3
-1
No files found.
app/services/git_push_service.rb
View file @
87c29cfa
...
...
@@ -84,11 +84,7 @@ class GitPushService
author
||=
commit_user
(
commit
)
issues_to_close
.
each
do
|
issue
|
if
project
.
jira_tracker?
&&
project
.
jira_service
.
active
project
.
jira_service
.
execute
(
commit
,
issue
)
else
Issues
::
CloseService
.
new
(
project
,
author
,
{}).
execute
(
issue
,
commit
)
end
Issues
::
CloseService
.
new
(
project
,
author
,
{}).
execute
(
issue
,
commit
)
end
end
...
...
app/services/issues/close_service.rb
View file @
87c29cfa
module
Issues
class
CloseService
<
Issues
::
BaseService
def
execute
(
issue
,
commit
=
nil
)
if
project
.
default_issues_tracker?
&&
issue
.
close
if
project
.
jira_tracker?
&&
project
.
jira_service
.
active
project
.
jira_service
.
execute
(
commit
,
issue
)
elsif
project
.
default_issues_tracker?
&&
issue
.
close
event_service
.
close_issue
(
issue
,
current_user
)
create_note
(
issue
,
commit
)
notification_service
.
close_issue
(
issue
,
current_user
)
...
...
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