projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2376-show-collection-tags-everywhere'
[arvados.git]
/
apps
/
workbench
/
.gitignore
diff --git
a/apps/workbench/.gitignore
b/apps/workbench/.gitignore
index 82be6f2d0bc83ef77e05c18c6c9fa90cb320c060..a656a5bc61f6dc05b29b840c25084fbfe62a375f 100644
(file)
--- a/
apps/workbench/.gitignore
+++ b/
apps/workbench/.gitignore
@@
-14,10
+14,24
@@
/log/*.log
/tmp
/log/*.log
/tmp
-config/.secret_token
+/config/.secret_token
+/config/initializers/secret_token.rb
/public/assets
/config/environments/development.rb
/public/assets
/config/environments/development.rb
+/config/environments/test.rb
+/config/environments/production.rb
+/config/application.yml
+/config/piwik.yml
+
+# editor backup files
*~
*~
+
+# Capistrano files are coming from another repo
+/Capfile*
+/config/deploy*
+
+# Themes are coming from another repo
+/themes/*