diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-28 18:11:12 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-28 18:11:12 +0300 |
| commit | 88eba240ff11ae71299a1032992860c96e7facae (patch) | |
| tree | 721516d035a26cdccadb4ead72f90a458e431246 | |
| parent | 03188f67ace9f2eda53c1ab2eeccea64c39a12e2 (diff) | |
Resolve spec/factories/projects.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | spec/factories/projects.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index f8f802553f2..e7d1874ebd1 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -32,12 +32,9 @@ FactoryBot.define do group_runners_enabled nil import_status nil import_jid nil -<<<<<<< HEAD last_update_at nil last_successful_update_at nil retry_count 0 -======= ->>>>>>> upstream/master end after(:create) do |project, evaluator| @@ -76,12 +73,9 @@ FactoryBot.define do if evaluator.import_status import_state = project.import_state || project.build_import_state import_state.status = evaluator.import_status -<<<<<<< HEAD import_state.last_update_at = evaluator.last_update_at import_state.last_successful_update_at = evaluator.last_successful_update_at import_state.retry_count = evaluator.retry_count -======= ->>>>>>> upstream/master import_state.jid = evaluator.import_jid import_state.save end |