diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-18 10:31:21 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-18 10:31:21 +0000 |
| commit | 0a05d8740ac710b814a8f89cec3fc85d6fae6be9 (patch) | |
| tree | e28de222d7d7334d6784be7f612e7763f016ae4a /spec/factories/todos.rb | |
| parent | eaf2f48dc7db706fa1dea050543667f8cdebd4c4 (diff) | |
| parent | b4ea25cafa0c7768a8618c673f9a1830f27fc950 (diff) | |
| download | gitlab-ce-0a05d8740ac710b814a8f89cec3fc85d6fae6be9.tar.gz | |
Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-module
# Conflicts:
# app/assets/javascripts/main.js
Diffstat (limited to 'spec/factories/todos.rb')
| -rw-r--r-- | spec/factories/todos.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb index 4975befbfe3..6a6de665dd1 100644 --- a/spec/factories/todos.rb +++ b/spec/factories/todos.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :todo do project author |