diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
| commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
| tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /shared/utils/server/jobs.ts | |
| parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
| parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
| download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip | |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'shared/utils/server/jobs.ts')
| -rw-r--r-- | shared/utils/server/jobs.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts index 3eec1d7d7..7c7e89824 100644 --- a/shared/utils/server/jobs.ts +++ b/shared/utils/server/jobs.ts | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | import * as request from 'supertest' | 1 | import * as request from 'supertest' |
| 2 | import { Job, JobState } from '../../models' | 2 | import { Job, JobState } from '../../models' |
| 3 | import { ServerInfo, wait } from '../index' | 3 | import { wait } from '../miscs/miscs' |
| 4 | import { ServerInfo } from './servers' | ||
| 4 | 5 | ||
| 5 | function getJobsList (url: string, accessToken: string, state: JobState) { | 6 | function getJobsList (url: string, accessToken: string, state: JobState) { |
| 6 | const path = '/api/v1/jobs/' + state | 7 | const path = '/api/v1/jobs/' + state |