Merge branch '2640-folder-api' into 1970-folder-view

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2f520c9ea060e09c153f041c90ab72cf720cad1e..2156fdf7e7404d77dcd0f853428596304aa9398f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,16 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-
-# Some sensitive files
-/config/api.clinicalfuture.com.*
-/config/database.yml
-
+.bundle
+.rvmrc
+*~
+*.pyc
+docker/*/generated
+docker/config.yml
+doc/.site
+doc/sdk/python/arvados
+sdk/perl/MYMETA.*
+sdk/perl/Makefile
+sdk/perl/blib
+sdk/perl/pm_to_blib
+*/vendor/bundle
+services/keep/bin
+services/keep/pkg
+services/keep/src/github.com