projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 2612-workbench-displays-user...
[arvados.git]
/
apps
/
workbench
/
.gitignore
diff --git
a/apps/workbench/.gitignore
b/apps/workbench/.gitignore
index b29947aa000d96eeaaf4e7e0afdc69b368bf2fdd..fcfa4583e0352b7b3c4956f07cd62e9084c0f751 100644
(file)
--- a/
apps/workbench/.gitignore
+++ b/
apps/workbench/.gitignore
@@
-20,6
+20,8
@@
/public/assets
/config/environments/development.rb
/public/assets
/config/environments/development.rb
+/config/environments/production.rb
+/config/application.yml
/config/piwik.yml
/config/piwik.yml
@@
-29,3
+31,6
@@
# Capistrano files are coming from another repo
/Capfile*
/config/deploy*
# Capistrano files are coming from another repo
/Capfile*
/config/deploy*
+
+# Themes are coming from another repo
+/themes/*