Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 40 insertions, 0 deletions

diff --git a/app/workers/jira_connect/sync_branch_worker.rb b/app/workers/jira_connect/sync_branch_worker.rb
new file mode 100644
index 00000000000..8c3416478fd
--- /dev/null
+++ b/app/workers/jira_connect/sync_branch_worker.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module JiraConnect
+  class SyncBranchWorker # rubocop:disable Scalability/IdempotentWorker
+    include ApplicationWorker
+
+    queue_namespace :jira_connect
+    feature_category :integrations
+    loggable_arguments 1, 2
+
+    def perform(project_id, branch_name, commit_shas)
+      project = Project.find_by_id(project_id)
+
+      return unless project
+
+      branches = [project.repository.find_branch(branch_name)] if branch_name.present?
+      commits = project.commits_by(oids: commit_shas) if commit_shas.present?
+
+      JiraConnect::SyncService.new(project).execute(commits: commits, branches: branches)
+    end
+  end
+end
diff --git a/app/workers/jira_connect/sync_merge_request_worker.rb b/app/workers/jira_connect/sync_merge_request_worker.rb
new file mode 100644
index 00000000000..b78bb8dfe16
--- /dev/null
+++ b/app/workers/jira_connect/sync_merge_request_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module JiraConnect
+  class SyncMergeRequestWorker # rubocop:disable Scalability/IdempotentWorker
+    include ApplicationWorker
+
+    queue_namespace :jira_connect
+    feature_category :integrations
+
+    def perform(merge_request_id)
+      merge_request = MergeRequest.find_by_id(merge_request_id)
+
+      return unless merge_request && merge_request.project
+
+      JiraConnect::SyncService.new(merge_request.project).execute(merge_requests: [merge_request])
+    end
+  end
+end