diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 15:13:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 15:13:30 +0300 |
| commit | 1972a51d40cb3be70fa0e8de3d6b4b48add5cb80 (patch) | |
| tree | 25b584ecf6cdcc0541946a812842753d80df6bce /app | |
| parent | 0a6f65ec4bf528236fd43ed1162bbb3297ed6337 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/jira_connect/sync_merge_request_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/jira_connect/sync_merge_request_worker.rb b/app/workers/jira_connect/sync_merge_request_worker.rb index 76f62e55ab1..79718b98e98 100644 --- a/app/workers/jira_connect/sync_merge_request_worker.rb +++ b/app/workers/jira_connect/sync_merge_request_worker.rb @@ -18,7 +18,9 @@ module JiraConnect return unless merge_request && project - branches = [project.repository.find_branch(merge_request.source_branch)].compact + branches = if Feature.enabled?(:jira_include_keys_from_associated_mr_for_branch, project) && merge_request.open? + [project.repository.find_branch(merge_request.source_branch)].compact.presence + end JiraConnect::SyncService.new(project).execute(merge_requests: [merge_request], branches: branches, update_sequence_id: update_sequence_id) end |