Merge branch 'develop' into feature/vue-serverview

This commit is contained in:
Dane Everitt 2018-09-05 21:34:59 -07:00
commit 5ca13839cf
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
110 changed files with 7190 additions and 2093 deletions

View file

@ -75,6 +75,7 @@ class ScheduleRepository extends EloquentRepository implements ScheduleRepositor
{
return $this->getBuilder()->with('tasks')
->where('is_active', true)
->where('is_processing', false)
->where('next_run_at', '<=', $timestamp)
->get($this->getColumns());
}