Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 0 deletions

diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index 0f6845dc5ee..dbb5c357acb 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -29,5 +29,9 @@ FactoryBot.define do
     trait :with_push_branch_filter do
       push_events_branch_filter { 'my-branch-*' }
     end
+
+    trait :permanently_disabled do
+      recent_failures { WebHook::FAILURE_THRESHOLD + 1 }
+    end
   end
 end
diff --git a/spec/factories/users/namespace_user_callouts.rb b/spec/factories/users/namespace_user_callouts.rb
new file mode 100644
index 00000000000..fded63d0cce
--- /dev/null
+++ b/spec/factories/users/namespace_user_callouts.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :namespace_callout, class: 'Users::NamespaceCallout' do
+    feature_name { :invite_members_banner }
+
+    user
+    namespace
+  end
+end