Clean up .gitignore files

diff --git a/.gitignore b/.gitignore
index 8cf65b56b86c6726fefa74bf280d0c2b1c089563..83eb73cbe775e2d769fd66254ec13cbab0552e58 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,13 @@
+.bundle
+.rvmrc
 *~
 *.pyc
-docker/*/generated/*
+docker/*/generated
 docker/config.yml
-doc/.site/*
+doc/.site
 doc/sdk/python/arvados
 sdk/perl/MYMETA.*
 sdk/perl/Makefile
-sdk/perl/blib/*
+sdk/perl/blib
 sdk/perl/pm_to_blib
+*/vendor/bundle

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index fcfa4583e0352b7b3c4956f07cd62e9084c0f751..afb317b169a9cd1a4f56ce03faa9c1c54720f12f 100644 (file)
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -1,12 +1,3 @@
-# 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
 
@@ -23,10 +14,10 @@
 /config/environments/production.rb
 /config/application.yml
 
-/config/piwik.yml
+# Workbench doesn't need one anyway, so this shouldn't come up, but...
+/config/database.yml
 
-# editor backup files
-*~
+/config/piwik.yml
 
 # Capistrano files are coming from another repo
 /Capfile*
@@ -34,3 +25,6 @@
 
 # Themes are coming from another repo
 /themes/*
+
+# This can be a symlink to ../../../doc/.site in dev setups
+/public/doc

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 6ddf5231ced091461771a94999948f521136ad55..1b76c6446b10fd1bad8e441d617654fe1e6b7ec3 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -1,12 +1,3 @@
-# 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
 
@@ -14,7 +5,7 @@
 /log/*.log
 /tmp
 
-# Some sensitive files
+# Sensitive files and local configuration
 /config/api.clinicalfuture.com.*
 /config/database.yml
 /config/initializers/omniauth.rb
@@ -23,19 +14,10 @@
 # asset cache
 /public/assets/
 
-# ignore .rvmrc
-.rvmrc
-
-# site-specific hardcoded API tokens
-/config/initializers/hardcoded_api_tokens.rb
-
 /config/environments/development.rb
 /config/environments/production.rb
 /config/environments/test.rb
 
-# editor backup files
-*~
-
 # Capistrano files are coming from another repo
 /Capfile*
 /config/deploy*