Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

diff --git a/spec/factories/resource_events/issue_assignment_events.rb b/spec/factories/resource_events/issue_assignment_events.rb
new file mode 100644
index 00000000000..72319905d0d
--- /dev/null
+++ b/spec/factories/resource_events/issue_assignment_events.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :issue_assignment_event, class: 'ResourceEvents::IssueAssignmentEvent' do
+    action { :add }
+    issue
+    user
+  end
+end
diff --git a/spec/factories/resource_events/merge_request_assignment_events.rb b/spec/factories/resource_events/merge_request_assignment_events.rb
new file mode 100644
index 00000000000..6d388543648
--- /dev/null
+++ b/spec/factories/resource_events/merge_request_assignment_events.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :merge_request_assignment_event, class: 'ResourceEvents::MergeRequestAssignmentEvent' do
+    action { :add }
+    merge_request
+    user
+  end
+end