]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Merge branch 'release/4.0.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 6 Jan 2022 12:31:37 +0000 (13:31 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 6 Jan 2022 12:31:37 +0000 (13:31 +0100)
1  2 
server/controllers/api/videos/captions.ts
server/middlewares/validators/videos/video-captions.ts
server/middlewares/validators/videos/videos.ts
server/tests/api/check-params/video-captions.ts
server/tests/api/check-params/video-imports.ts

index 47c491b4c5b81901828168c1b307fa0e3f461137,4fc4c8ec5fb0b51ffd03f7423f76072d7f942fce..a399871e194a81ea52c3a4b9fa2fcacf593c04b2
@@@ -1,6 -1,6 +1,6 @@@
  import express from 'express'
  import { body, param } from 'express-validator'
- import { UserRight } from '@shared/models'
 -import { HttpStatusCode, UserRight } from '../../../../shared'
++import { HttpStatusCode, UserRight } from '@shared/models'
  import { isVideoCaptionFile, isVideoCaptionLanguageValid } from '../../../helpers/custom-validators/video-captions'
  import { cleanUpReqFiles } from '../../../helpers/express-utils'
  import { logger } from '../../../helpers/logger'
index 8a88407936aab609e7f98d6d430bdb1ab23c354c,84c6c1355c1ca1709a6413b2bdbc01329d47482a..9881df80cd6975d3d78eb4d66685c7156dbbfbd9
@@@ -1,9 -1,8 +1,9 @@@
  /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
  
  import 'mocha'
- import { HttpStatusCode, VideoCreateResult } from '@shared/models'
 +import { buildAbsoluteFixturePath } from '@shared/core-utils'
++import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models'
  import {
 -  buildAbsoluteFixturePath,
    cleanupTests,
    createSingleServer,
    makeDeleteRequest,