diff options
-rw-r--r-- | client/package.json | 2 | ||||
-rwxr-xr-x | scripts/travis.sh | 2 | ||||
-rw-r--r-- | server/lib/activitypub/process/process-update.ts | 1 | ||||
-rw-r--r-- | server/lib/activitypub/videos.ts | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/client/package.json b/client/package.json index f9becb215..a14376fd8 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -13,7 +13,7 @@ | |||
13 | "url": "git://github.com/Chocobozzz/PeerTube.git" | 13 | "url": "git://github.com/Chocobozzz/PeerTube.git" |
14 | }, | 14 | }, |
15 | "scripts": { | 15 | "scripts": { |
16 | "lint": "standard && tslint --type-check --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts'", | 16 | "lint": "standard && tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts'", |
17 | "webpack": "webpack", | 17 | "webpack": "webpack", |
18 | "ng": "ng", | 18 | "ng": "ng", |
19 | "postinstall": "npm rebuild node-sass", | 19 | "postinstall": "npm rebuild node-sass", |
diff --git a/scripts/travis.sh b/scripts/travis.sh index f24aac885..e03f1072d 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh | |||
@@ -25,5 +25,5 @@ elif [ "$1" = "lint" ]; then | |||
25 | npm run lint || exit -1 | 25 | npm run lint || exit -1 |
26 | 26 | ||
27 | cd .. || exit -1 | 27 | cd .. || exit -1 |
28 | npm run tslint -- --type-check --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" || exit -1 | 28 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" || exit -1 |
29 | fi | 29 | fi |
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index b5c97e515..c0038be64 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts | |||
@@ -2,7 +2,6 @@ import * as Bluebird from 'bluebird' | |||
2 | import { ActivityUpdate } from '../../../../shared/models/activitypub' | 2 | import { ActivityUpdate } from '../../../../shared/models/activitypub' |
3 | import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor' | 3 | import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor' |
4 | import { VideoTorrentObject } from '../../../../shared/models/activitypub/objects' | 4 | import { VideoTorrentObject } from '../../../../shared/models/activitypub/objects' |
5 | import { VideoFile } from '../../../../shared/models/videos' | ||
6 | import { retryTransactionWrapper } from '../../../helpers/database-utils' | 5 | import { retryTransactionWrapper } from '../../../helpers/database-utils' |
7 | import { logger } from '../../../helpers/logger' | 6 | import { logger } from '../../../helpers/logger' |
8 | import { resetSequelizeInstance } from '../../../helpers/utils' | 7 | import { resetSequelizeInstance } from '../../../helpers/utils' |
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 263c2629c..50e7e5cde 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts | |||
@@ -1,4 +1,3 @@ | |||
1 | import * as Bluebird from 'bluebird' | ||
2 | import * as magnetUtil from 'magnet-uri' | 1 | import * as magnetUtil from 'magnet-uri' |
3 | import { join } from 'path' | 2 | import { join } from 'path' |
4 | import * as request from 'request' | 3 | import * as request from 'request' |