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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 386f0513af861f01cb92952a2cb6e2306346e799..380a88047f9ad35e43edb8abe354958e78fdadbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,15 @@
 *~
 .DS_Store
 *~
 .DS_Store

+.bundle/config

 .idea
 .idea

+.local-overcommit.yml

 .ruby-gemset
 .ruby-version
 .vagrant
 app/assets/javascripts/i18n
 .ruby-gemset
 .ruby-version
 .vagrant
 app/assets/javascripts/i18n

+config/credentials.yml.enc
+config/master.key

 config/environments/*.local.yml
 config/environments/*.local.yml

-config/piwik.yml

 config/settings.local.yml
 config/settings/*.local.yml
 coverage
 config/settings.local.yml
 config/settings/*.local.yml
 coverage


@@ -16,4 +19,8 @@ node_modules
 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export

+storage

 tmp
 tmp

+
+# docker-compose database directory
+docker-db-data