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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1328658c6ab5b70d2809f6c665e51ff05b447514..73316769e63ae7989ff9507682a1011cdf9db21a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@ public/attachments
 public/export
 storage
 tmp
+
+# docker-compose database directory
+docker-db-data