Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 0 deletions

diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index 998672ebe7c..050cb8f8e6c 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -7,6 +7,14 @@ FactoryBot.define do
     association :project, :repository
     sequence(:external_url) { |n| "https://env#{n}.example.gitlab.com" }
 
+    trait :available do
+      state { :available }
+    end
+
+    trait :stopped do
+      state { :stopped }
+    end
+
     trait :with_review_app do |environment|
       transient do
         ref { 'master' }
diff --git a/spec/factories/users_statistics.rb b/spec/factories/users_statistics.rb
new file mode 100644
index 00000000000..5b0871f2262
--- /dev/null
+++ b/spec/factories/users_statistics.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :users_statistics do
+  end
+end