Merge branch 'master' into 2333-crunch-dispatch-token-management

[arvados.git] / services / api / .gitignore

diff --git a/services/api/.gitignore b/services/api/.gitignore
index d6b08d646bd922cbe5fdc918a299216c9fac1c6c..6ddf5231ced091461771a94999948f521136ad55 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -18,6 +18,7 @@
 /config/api.clinicalfuture.com.*
 /config/database.yml
 /config/initializers/omniauth.rb
+/config/application.yml
 
 # asset cache
 /public/assets/
@@ -29,6 +30,13 @@
 /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*
+