Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 81d3e4be6fd..2e783adcc94 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -6,6 +6,18 @@ FactoryBot.define do
     color { "#990000" }
   end
 
+  trait :described do
+    description { "Description of #{title}" }
+  end
+
+  trait :scoped do
+    transient do
+      prefix { 'scope' }
+    end
+
+    title { "#{prefix}::#{generate(:label_title)}" }
+  end
+
   factory :label, traits: [:base_label], class: 'ProjectLabel' do
     project