Skip to content

Commit

Permalink
BE-637 Merge branch min-config-rel-4.0 into master
Browse files Browse the repository at this point in the history
* Updated failed tests

Signed-off-by: nfrunza <nfrunza@gmail.com>
Change-Id: I1039017339f5b5e78ab2aaf148c8bbb654ea3cb3
  • Loading branch information
nfrunza committed May 22, 2019
1 parent 05d6120 commit ed4fc5b
Show file tree
Hide file tree
Showing 529 changed files with 81,995 additions and 37,376 deletions.
6 changes: 5 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@

#SPDX-License-Identifier: Apache-2.0
node_modules
client/node_modules
client/node_modules
app/platform/fabric/e2e-test
wallet/
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# SPDX-License-Identifier: Apache-2.0
#

root = true

[*]
# tabbed indentation:
indent_style = tab
indent_size = 1
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
# editorconfig-tools is unable to ignore longs strings or urls
max_line_length = null
[*.{md,txt}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
16 changes: 16 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
#SPDX-License-Identifier: Apache-2.0
**/node_modules/**
**/client/build/**
**/client/coverage/**
**/client/src/services/__mocks__/**
**/app/test//node_modules/**
**/app/persistence/fabric/postgreSQL/db/**
**/app/test/**
**/app/platform/fabric/e2e-test/**
*.css
**/client/src/components/View/*.spec.js
**/client/src/components/Panels/*.spec.js
**/client/src/components/*.spec.js
**/client/src/components/Lists/*.spec.js
**/client/src/components/Header/*.spec.js
**/client/src/components/App/*.spec.js

Loading

0 comments on commit ed4fc5b

Please sign in to comment.