diff --git a/.gitignore b/.gitignore index 169027c360b4cce6b7ff20ef41a66f4cd6e42676..42d4f59269de7e3da430bb1fdf3de4e0b4deb9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /*.sublime-project /*.sublime-workspace /dist +/.idea diff --git a/scripts/upgrade-peertube.sh b/scripts/upgrade-peertube.sh index f7b8564707d2eaa1038d0aba99a22293374c1ae4..5186a269fa7d66c42708452bedd31ba4632c14a2 100755 --- a/scripts/upgrade-peertube.sh +++ b/scripts/upgrade-peertube.sh @@ -35,4 +35,4 @@ git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1 yarn install --pure-lockfile npm run build -echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." +echo -e "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." diff --git a/server.ts b/server.ts index a6a9fcb027e54b853e734c0c72a6e87c331c7e3b..1ba208c280b38ffc3940044387074b3d19530724 100644 --- a/server.ts +++ b/server.ts @@ -24,7 +24,7 @@ process.title = 'peertube' const app = express() // ----------- Database ----------- -// Do not use barels because we don't want to load all modules here (we need to initialize database first) +// Do not use barrels because we don't want to load all modules here (we need to initialize database first) import { logger } from './server/helpers/logger' import { API_VERSION, CONFIG } from './server/initializers/constants' // Initialize database and models @@ -55,7 +55,7 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers' // ----------- App ----------- -// Enable cors for develop +// Enable CORS for develop if (isTestInstance()) { app.use(cors({ origin: 'http://localhost:3000',