summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorJarka Kadlecová <jarka@gitlab.com>2018-07-16 15:35:19 +0200
committerJarka Kadlecová <jarka@gitlab.com>2018-08-02 10:42:45 +0200
commit15179878d57addb010b5afeadd4bde8b62ef3acb (patch)
treeaad121955d9ab691584613e3aea20a1b9c5eeaea /spec/factories
parent0233fffe283857d9934460625f9c17fcd278536b (diff)
downloadgitlab-ce-15179878d57addb010b5afeadd4bde8b62ef3acb.tar.gz
Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""
This reverts commit 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175.
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/todos.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index 94f8caedfa6..14486c80341 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -1,8 +1,8 @@
FactoryBot.define do
factory :todo do
project
- author { project.creator }
- user { project.creator }
+ author { project&.creator || user }
+ user { project&.creator || user }
target factory: :issue
action { Todo::ASSIGNED }