Merge remote-tracking branch 'origin' into 1786-replace-jekyll-with-zenweb

[arvados.git] / apps / workbench / .gitignore

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index e942afbfa7927dac9048b688d9dbd5a1ffa1fef7..89efb8185f003a5019d99a83a547798fcdca6a0d 100644 (file)
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -14,11 +14,16 @@
 /log/*.log
 /tmp
 
-config/.secret_token
+/config/.secret_token
+/config/initializers/secret_token.rb
 
 /public/assets
 
 /config/environments/development.rb
+/config/environments/test.rb
+/config/environments/production.rb
+
+/config/piwik.yml
 
 # editor backup files
 *~
@@ -27,3 +32,5 @@ config/.secret_token
 /Capfile*
 /config/deploy*
 
+# Themes are coming from another repo
+/themes/*