diff --git a/.gitattributes b/.gitattributes
index 4a98681b88..42bacf62cb 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,9 @@
+.github export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
+.codeclimate.yml export-ignore
+.scrutinizer.yml export-ignore
+.styleci.yml export-ignore
 .travis.yml export-ignore
 /tests export-ignore
 
diff --git a/.gitignore b/.gitignore
index 2390658b22..32845ee4f7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 # Cache directories
+
 app/cache/*
-!app/cache/.htaccess
+!app/cache/.gitkeep
+
+app/logs/*
+!app/logs/.gitkeep
 
 # Chamilo configuration
 /app/config/parameters.yml
@@ -19,9 +23,6 @@ app/courses/*
 # Home
 app/home/*
 
-app/logs/*
-app/Resources/views/*
-
 # Upload content
 app/upload/*
 
diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2