X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=fbf8fdf3c2c233e72870b74ad99279568dba58b6;hb=c1e5bd23d557976ba11f89c53a00c1657a7ea890;hp=7ca89dca8532625749c8e09c466040913187a17b;hpb=a6375e69668ea42e19531c6bc68dcd37f3f7cbd7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitignore b/.gitignore
index 7ca89dca8..fbf8fdf3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,47 @@
-node_modules
-schemes/
-certs/
-logs/
-test1/
-test2/
-test3/
-test4/
-test5/
-test6/
-public/stylesheets/global.css
-public/stylesheets/vendor
-uploads
-thumbnails
-config/production.yaml
-ffmpeg
-<<<<<<< HEAD
-torrents
-=======
-.tags
-*.sublime-project
-*.sublime-workspace
-torrents/
->>>>>>> master
+# NPM instalation
+/node_modules/
+/server/tools/node_modules
+*npm-debug.log
+
+# Testing
+/test1/
+/test2/
+/test3/
+/test4/
+/test5/
+/test6/
+/server/tests/fixtures/video_high_bitrate_1080p.mp4
+
+# Production
+/storage/
+/config/production.yaml
+/config/local*
+/ffmpeg/
+/ffmpeg-3/
+/ffmpeg-4/
+/thumbnails/
+/torrents/
+/videos/
+/previews/
+/logs/
+
+# IDE
+/*.sublime-project
+/*.sublime-workspace
+/**/.idea
+/dist
+/PeerTube.iml
+
+# Zanata
+/.zanata-cache
+/scripts/i18n/generate-iso639-target.ts
+
+# Other
+/dump.rdb
+/.theia/
+/profiling/
+/*.zip
+/*.tar.xz
+/*.asc
+/server/tools/import-mediacore.ts
+/docker-volume/