Merge branch 'master' into 1786-replace-jekyll-with-zenweb

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

diff --git a/services/api/.gitignore b/services/api/.gitignore
index d6b08d646bd922cbe5fdc918a299216c9fac1c6c..80ba00019016bce1d9ca97324bf740215b60d450 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -29,6 +29,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*
+