summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-10-05 14:27:42 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-10-05 14:27:42 +0200
commitaba71835f310d5aad9c2af9e22c81bd44e6f0686 (patch)
tree40abb714359b8bed16bc5f43b7c4a085eb12d473 /spec/factories
parentb229637b0837065a9993d06573b41218ab7e9dfb (diff)
parent1fe7a42afca83fbbda638d9569d58a87039cd8f2 (diff)
downloadgitlab-ce-aba71835f310d5aad9c2af9e22c81bd44e6f0686.tar.gz
Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/emails.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index 8303861bcfe..c9ab87a15aa 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -2,5 +2,7 @@ FactoryGirl.define do
factory :email do
user
email { generate(:email_alias) }
+
+ trait(:confirmed) { confirmed_at Time.now }
end
end