diff options
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/after_create_service.rb | 2 | ||||
-rw-r--r-- | app/services/merge_requests/base_service.rb | 2 | ||||
-rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/services/merge_requests/after_create_service.rb b/app/services/merge_requests/after_create_service.rb index f0c85ae03c9..fbb9d5fa9dc 100644 --- a/app/services/merge_requests/after_create_service.rb +++ b/app/services/merge_requests/after_create_service.rb @@ -11,6 +11,8 @@ module MergeRequests merge_request.diffs(include_stats: false).write_cache merge_request.create_cross_references!(current_user) + + NamespaceOnboardingAction.create_action(merge_request.target_project.namespace, :merge_request_created) end end end diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index aa591312c6a..265b211066e 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -58,7 +58,7 @@ module MergeRequests return unless project.jira_subscription_exists? 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, Atlassian::JiraConnect::Client.generate_update_sequence_id) end end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 8c069ea5bb0..bff7a43dd7b 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -11,7 +11,7 @@ module MergeRequests params.delete(:target_project_id) params.delete(:source_branch) - if merge_request.closed_without_fork? + if merge_request.closed_or_merged_without_fork? params.delete(:target_branch) params.delete(:force_remove_source_branch) end |