Merge branch '2221-complete-docker' (closes #2325, closes #2221)

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

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 80ba00019016bce1d9ca97324bf740215b60d450..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/