Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 0 deletions

diff --git a/spec/factories/error_tracking/detailed_error.rb b/spec/factories/error_tracking/detailed_error.rb
index 0fba79b2acb..7e217246f91 100644
--- a/spec/factories/error_tracking/detailed_error.rb
+++ b/spec/factories/error_tracking/detailed_error.rb
@@ -34,6 +34,7 @@ FactoryBot.define do
     last_release_last_commit { '9ad419c86' }
     first_release_short_version { 'abc123' }
     last_release_short_version { 'abc123' }
+    first_release_version { '123456' }
 
     skip_create
   end
diff --git a/spec/factories/releases.rb b/spec/factories/releases.rb
index 182ee2378d4..0e79f2e6d3a 100644
--- a/spec/factories/releases.rb
+++ b/spec/factories/releases.rb
@@ -20,5 +20,14 @@ FactoryBot.define do
         create(:evidence, release: release)
       end
     end
+
+    trait :with_milestones do
+      transient do
+        milestones_count { 2 }
+      end
+      after(:create) do |release, evaluator|
+        create_list(:milestone, evaluator.milestones_count, project: evaluator.project, releases: [release])
+      end
+    end
   end
 end