Merge master into docker-package-lock

omni · May 23, 2019 · a714aec · a714aec
2 parents f22e32c + d98073b
commit a714aec
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 67 deletions.
diff --git a/oracle/.editorconfig → .editorconfig b/oracle/.editorconfig → .editorconfig
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,44 @@
+# dependencies
 node_modules
+
+# testing
+coverage
+
+# production
+build
+
+# misc
+.DS_Store
 .env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 .idea
 .nyc_output
-coverage/
 logs/
+responses/*
+!responses/.gitkeep
+*.err
+*.out
+data
+
+# contracts build
+ui/src/contracts
+
+# compiled css
+*.css
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+#deployment
+*.retry
+hosts.yml
+hosts
+*.log
+Vagrantfile
+vagrant-hosts.yml
+.vagrant
+
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+10.15
diff --git a/deployment/.gitignore b/deployment/.gitignore
diff --git a/deployment/oracle/.gitignore b/deployment/oracle/.gitignore
diff --git a/monitor/.gitignore b/monitor/.gitignore
diff --git a/oracle-e2e/.dockerignore b/oracle-e2e/.dockerignore
diff --git a/oracle-e2e/.gitignore b/oracle-e2e/.gitignore
diff --git a/oracle-e2e/.nvmrc b/oracle-e2e/.nvmrc
diff --git a/oracle/.nvmrc b/oracle/.nvmrc
diff --git a/oracle/.nycrc b/oracle/.nycrc
diff --git a/ui/.dockerignore b/ui/.dockerignore
diff --git a/ui/.gitignore b/ui/.gitignore
diff --git a/ui/.nvmrc b/ui/.nvmrc