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
87f7925c
Commit
87f7925c
authored
Aug 22, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded check for merge_request.project
parent
17010a6e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
app/services/merge_requests/base_service.rb
app/services/merge_requests/base_service.rb
+3
-5
ee/app/services/ee/merge_requests/base_service.rb
ee/app/services/ee/merge_requests/base_service.rb
+1
-1
No files found.
app/services/merge_requests/base_service.rb
View file @
87f7925c
...
@@ -17,12 +17,10 @@ module MergeRequests
...
@@ -17,12 +17,10 @@ module MergeRequests
end
end
def
execute_hooks
(
merge_request
,
action
=
'open'
,
old_rev:
nil
,
old_associations:
{})
def
execute_hooks
(
merge_request
,
action
=
'open'
,
old_rev:
nil
,
old_associations:
{})
if
merge_request
.
project
merge_data
=
hook_data
(
merge_request
,
action
,
old_rev:
old_rev
,
old_associations:
old_associations
)
merge_data
=
hook_data
(
merge_request
,
action
,
old_rev:
old_rev
,
old_associations:
old_associations
)
merge_request
.
project
.
execute_hooks
(
merge_data
,
:merge_request_hooks
)
merge_request
.
project
.
execute_hooks
(
merge_data
,
:merge_request_hooks
)
merge_request
.
project
.
execute_services
(
merge_data
,
:merge_request_hooks
)
merge_request
.
project
.
execute_services
(
merge_data
,
:merge_request_hooks
)
end
end
end
def
cleanup_environments
(
merge_request
)
def
cleanup_environments
(
merge_request
)
Ci
::
StopEnvironmentsService
.
new
(
merge_request
.
source_project
,
current_user
)
Ci
::
StopEnvironmentsService
.
new
(
merge_request
.
source_project
,
current_user
)
...
...
ee/app/services/ee/merge_requests/base_service.rb
View file @
87f7925c
...
@@ -9,7 +9,7 @@ module EE
...
@@ -9,7 +9,7 @@ module EE
def
execute_hooks
(
merge_request
,
action
=
'open'
,
old_rev:
nil
,
old_associations:
{})
def
execute_hooks
(
merge_request
,
action
=
'open'
,
old_rev:
nil
,
old_associations:
{})
super
super
return
unless
merge_request
.
project
&&
jira_subscription_exists?
return
unless
jira_subscription_exists?
if
Atlassian
::
JiraIssueKeyExtractor
.
has_keys?
(
merge_request
.
title
,
merge_request
.
description
)
if
Atlassian
::
JiraIssueKeyExtractor
.
has_keys?
(
merge_request
.
title
,
merge_request
.
description
)
JiraConnect
::
SyncMergeRequestWorker
.
perform_async
(
merge_request
.
id
)
JiraConnect
::
SyncMergeRequestWorker
.
perform_async
(
merge_request
.
id
)
...
...
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