Skip to content

Commit

Permalink
Merge pull request Superalgos#4389 from Superalgos/develop
Browse files Browse the repository at this point in the history
Develop into Master
  • Loading branch information
Luis-Fernando-Molina authored Oct 14, 2022
2 parents 0165a56 + 67c9422 commit f6e1cd7
Show file tree
Hide file tree
Showing 265 changed files with 67,792 additions and 8,809 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ CODE_OF_CONDUCT.md
**/docker-compose.yml
**/node_modules
**/.env*
**/externalScripts
9 changes: 5 additions & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

if [ "$UNITTESTS" != "false" ]
then
npm run unitTest
fi
# Disabling unit tests until resolution of jest memory issue - https://github.com/facebook/jest/issues/11956
# if [ "$UNITTESTS" != "false" ]
# then
# npm run unitTest
# fi
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"**/node_modules": true,
"**/My-Social-Trading-Data": true,
"**/My-Network-Nodes-Data": true,
"**/My-Workspaces": true,
// "**/My-Workspaces": true,
"**/My-Secrets": true,
"**/My-Data-Storage": true,
"**/My-Log-Files": true,
Expand All @@ -16,7 +16,7 @@
"**/node_modules*": true,
"**/My-Social-Trading-Data*": true,
"**/My-Network-Nodes-Data*": true,
"**/My-Workspaces*": true,
// "**/My-Workspaces*": true,
"**/My-Secrets*": true,
"**/My-Data-Storage*": true,
"**/My-Log-Files*": true,
Expand Down
Loading

0 comments on commit f6e1cd7

Please sign in to comment.