diff options
author | Chocobozzz <me@florianbigard.com> | 2021-01-11 15:39:15 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-01-11 15:39:15 +0100 |
commit | a11a782f5c142f88acff8b604224cefeb8417cf1 (patch) | |
tree | 890065104873dfefaf3f08c72f4543ff39635e4c | |
parent | 1acb94750408490ce89264f92a14aceeffe81c96 (diff) | |
download | PeerTube-a11a782f5c142f88acff8b604224cefeb8417cf1.tar.gz PeerTube-a11a782f5c142f88acff8b604224cefeb8417cf1.tar.zst PeerTube-a11a782f5c142f88acff8b604224cefeb8417cf1.zip |
Fix duplicate entry in job list page
-rw-r--r-- | client/src/app/+admin/system/jobs/jobs.component.ts | 1 | ||||
-rw-r--r-- | server/tests/api/videos/video-privacy.ts | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts index b7f18067b..b1940b0d3 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.ts +++ b/client/src/app/+admin/system/jobs/jobs.component.ts | |||
@@ -32,7 +32,6 @@ export class JobsComponent extends RestTable implements OnInit { | |||
32 | 'video-import', | 32 | 'video-import', |
33 | 'videos-views', | 33 | 'videos-views', |
34 | 'activitypub-refresher', | 34 | 'activitypub-refresher', |
35 | 'video-live-ending', | ||
36 | 'video-redundancy', | 35 | 'video-redundancy', |
37 | 'video-live-ending' | 36 | 'video-live-ending' |
38 | ] | 37 | ] |
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts index f25d75af4..fed6ca0e0 100644 --- a/server/tests/api/videos/video-privacy.ts +++ b/server/tests/api/videos/video-privacy.ts | |||
@@ -137,7 +137,7 @@ describe('Test video privacy', function () { | |||
137 | }) | 137 | }) |
138 | 138 | ||
139 | it('Should upload an unlisted video on server 2', async function () { | 139 | it('Should upload an unlisted video on server 2', async function () { |
140 | this.timeout(30000) | 140 | this.timeout(60000) |
141 | 141 | ||
142 | const attributes = { | 142 | const attributes = { |
143 | name: 'unlisted video', | 143 | name: 'unlisted video', |