Merge branch 'master' into 2756-eventbus-in-workbench

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 82be6f2d0bc83ef77e05c18c6c9fa90cb320c060..602e1b9e40dbb8eda8a20ca1a607c40fa7e0b525 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,18 @@
-# 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
-
-config/.secret_token
-
-/public/assets
-
-/config/environments/development.rb
-
+.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
+sdk/java/target
+*.class