Merge branch 'master' into 5200-anonymous-download

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

diff --git a/services/api/.gitignore b/services/api/.gitignore
index d6b08d646bd922cbe5fdc918a299216c9fac1c6c..4ad5e10faa46b96222d4291596d2f47f686bf18c 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -1,34 +1,30 @@
-# 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
+/log/*.log.gz
 /tmp
 
-# Some sensitive files
-/config/api.clinicalfuture.com.*
+# Sensitive files and local configuration
 /config/database.yml
 /config/initializers/omniauth.rb
+/config/application.yml
 
 # asset cache
 /public/assets/
 
-# ignore .rvmrc
-.rvmrc
+/config/environments/development.rb
+/config/environments/production.rb
+/config/environments/test.rb
 
-# site-specific hardcoded API tokens
-/config/initializers/hardcoded_api_tokens.rb
+# Capistrano files are coming from another repo
+/Capfile*
+/config/deploy*
 
-/config/environments/development.rb
+# SimpleCov reports
+/coverage
 
-# editor backup files
-*~
+# Dev/test SSL certificates
+/self-signed.key
+/self-signed.pem