Merge remote-tracking branch 'upstream/pull/4724'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1328658c6ab5b70d2809f6c665e51ff05b447514..444dc99c9c1cc38a1184c75778de5e916fad7977 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,14 @@
 *~
 .DS_Store
+.bundle/config
 .idea
 .ruby-gemset
 .ruby-version
 .vagrant
 app/assets/javascripts/i18n
+config/credentials.yml.enc
+config/master.key
 config/environments/*.local.yml
-config/piwik.yml
 config/settings.local.yml
 config/settings/*.local.yml
 coverage
@@ -18,3 +20,6 @@ public/attachments
 public/export
 storage
 tmp
+
+# docker-compose database directory
+docker-db-data