Merge branch 'release/2.1.0' into develop

diff --combined client/src/app/menu/menu.component.scss
index cb5f907232f04ccb1155574d3f4395fc8ee647e5,112fdc1ce694a05b906204546c33a76deae1dfb3..dec04592869a0931015660048601c9c5bc803951
--- 1/client/src/app/menu/menu.component.scss
--- 2/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@@ -6,8 -6,7 +6,8 @@@
    height: calc(100vh - #{$header-height});
    padding: 0;
    width: $menu-width;
 -  z-index: 10000;
 +  z-index: z(menu);
 +  scrollbar-color: var(--actionButtonColor) var(--menuBackgroundColor);
  }
  
  menu {
@@@ -261,3 -260,11 +261,11 @@@
      width: 100% !important;
    }
  }
+ 
+ @media (hover: none) and (pointer: coarse) {
+   .menu-wrapper {
+     menu {
+       overflow-y: auto;
+     }
+   }
+ }

diff --combined server/controllers/client.ts
index e4643e1711dc68a92b9b2c9158e2ca74536ebf00,56685f1021326352c91a0f4d970194760c1910bd..20689fb58a7957e3d2848722f8c723262aa39991
--- 1/server/controllers/client.ts
--- 2/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@@ -2,10 -2,11 +2,11 @@@ import * as express from 'express
  import { join } from 'path'
  import { root } from '../helpers/core-utils'
  import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants'
- import { asyncMiddleware } from '../middlewares'
+ import { asyncMiddleware, embedCSP } from '../middlewares'
  import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n'
  import { ClientHtml } from '../lib/client-html'
  import { logger } from '../helpers/logger'
+ import { CONFIG } from '@server/initializers/config'
  
  const clientsRouter = express.Router()
  
@@@ -19,8 -20,13 +20,13 @@@ clientsRouter.use('/videos/watch/:id', 
  clientsRouter.use('/accounts/:nameWithHost', asyncMiddleware(generateAccountHtmlPage))
  clientsRouter.use('/video-channels/:nameWithHost', asyncMiddleware(generateVideoChannelHtmlPage))
  
+ const embedCSPMiddleware = CONFIG.CSP.ENABLED
+   ? embedCSP
+   : (req: express.Request, res: express.Response, next: express.NextFunction) => next()
+ 
  clientsRouter.use(
    '/videos/embed',
+   embedCSPMiddleware,
    (req: express.Request, res: express.Response) => {
      res.removeHeader('X-Frame-Options')
      res.sendFile(embedPath)
@@@ -66,7 -72,7 +72,7 @@@ export 
  
  // ---------------------------------------------------------------------------
  
 -async function serveServerTranslations (req: express.Request, res: express.Response) {
 +function serveServerTranslations (req: express.Request, res: express.Response) {
    const locale = req.params.locale
    const file = req.params.file