Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 82383cfa2b0..a259c5142fc 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -13,7 +13,7 @@ FactoryBot.define do
     end
 
     trait :remote_store do
-      file_store { JobArtifactUploader::Store::REMOTE}
+      file_store { JobArtifactUploader::Store::REMOTE }
     end
 
     after :build do |artifact|
diff --git a/spec/factories/diff_note_positions.rb b/spec/factories/diff_note_positions.rb
new file mode 100644
index 00000000000..6e95e306d50
--- /dev/null
+++ b/spec/factories/diff_note_positions.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :diff_note_position do
+    association :note, factory: :diff_note_on_merge_request
+    line_code { note.line_code }
+    position { note.position }
+    diff_type { :head }
+  end
+end