Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 5 deletions

diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
index 4b6c1756d1e..d51c437f83a 100644
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -6,7 +6,7 @@ FactoryBot.define do
     path { name.downcase.gsub(/\s/, '_') }
     type { 'Group' }
     owner { nil }
-    project_creation_level { ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS}
+    project_creation_level { ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS }
 
     after(:create) do |group|
       if group.owner
@@ -17,15 +17,15 @@ FactoryBot.define do
     end
 
     trait :public do
-      visibility_level { Gitlab::VisibilityLevel::PUBLIC}
+      visibility_level { Gitlab::VisibilityLevel::PUBLIC }
     end
 
     trait :internal do
-      visibility_level {Gitlab::VisibilityLevel::INTERNAL}
+      visibility_level {Gitlab::VisibilityLevel::INTERNAL }
     end
 
     trait :private do
-      visibility_level { Gitlab::VisibilityLevel::PRIVATE}
+      visibility_level { Gitlab::VisibilityLevel::PRIVATE }
     end
 
     trait :with_avatar do
@@ -49,7 +49,7 @@ FactoryBot.define do
     end
 
     trait :owner_subgroup_creation_only do
-      subgroup_creation_level { ::Gitlab::Access::OWNER_SUBGROUP_ACCESS}
+      subgroup_creation_level { ::Gitlab::Access::OWNER_SUBGROUP_ACCESS }
     end
   end
 end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 0868e38f70e..7c3ba122b5a 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -16,6 +16,7 @@ FactoryBot.define do
     factory :note_on_merge_request,      traits: [:on_merge_request]
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
     factory :note_on_personal_snippet,   traits: [:on_personal_snippet]
+    factory :note_on_design,             traits: [:on_design]
     factory :system_note,                traits: [:system]
 
     factory :discussion_note, class: 'DiscussionNote'