diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-20 11:43:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-20 11:43:17 +0000 |
commit | dfc94207fec2d84314b1a5410cface22e8b369bd (patch) | |
tree | c54022f61ced104305889a64de080998a0dc773b /app/workers/jira_connect/sync_merge_request_worker.rb | |
parent | b874efeff674f6bf0355d5d242ecf81c6f7155df (diff) | |
download | gitlab-ce-dfc94207fec2d84314b1a5410cface22e8b369bd.tar.gz |
Add latest changes from gitlab-org/gitlab@15-11-stable-eev15.11.0-rc42
Diffstat (limited to 'app/workers/jira_connect/sync_merge_request_worker.rb')
-rw-r--r-- | app/workers/jira_connect/sync_merge_request_worker.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/workers/jira_connect/sync_merge_request_worker.rb b/app/workers/jira_connect/sync_merge_request_worker.rb index 6576aa9fdf4..a0a56695689 100644 --- a/app/workers/jira_connect/sync_merge_request_worker.rb +++ b/app/workers/jira_connect/sync_merge_request_worker.rb @@ -14,10 +14,13 @@ module JiraConnect def perform(merge_request_id, update_sequence_id) merge_request = MergeRequest.find_by_id(merge_request_id) + project = merge_request&.project - return unless merge_request && merge_request.project + return unless merge_request && project - JiraConnect::SyncService.new(merge_request.project).execute(merge_requests: [merge_request], update_sequence_id: update_sequence_id) + branches = [project.repository.find_branch(merge_request.source_branch)].compact.presence if merge_request.open? + + JiraConnect::SyncService.new(project).execute(merge_requests: [merge_request], branches: branches, update_sequence_id: update_sequence_id) end end end |