Skip to content

Commit

Permalink
Merge pull request #359 from frg-fossee/develop
Browse files Browse the repository at this point in the history
merge develop into master
  • Loading branch information
fresearchgroup authored Aug 13, 2021
2 parents e1cdde8 + 584773c commit 46464da
Show file tree
Hide file tree
Showing 215 changed files with 18,495 additions and 2,943 deletions.
8 changes: 1 addition & 7 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,9 @@ MYSQL_USER=user
MYSQL_PASSWORD=password
MYSQL_ROOT_PASSWORD=password


#MongoDB Config
MONGO_INITDB_ROOT_USERNAME=user
MONGO_INITDB_ROOT_PASSWORD=password

#Docker Image Version Tags
TAG_MYSQL=8.0
TAG_REDIS=alpine3.11
TAG_MONGO=4.2.6

#Production Config
GUNICORN_WORKERS=5
Expand All @@ -58,4 +52,4 @@ EMAIL_HOST=smtp.gmail.com
EMAIL_HOST_USER=youremail@gmail.com
EMAIL_HOST_PASSWORD=yourpassword
EMAIL_PORT=587
EMAIL_USE_TLS=True
EMAIL_USE_TLS=True
1 change: 1 addition & 0 deletions .github/workflows/reactTestBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- name: Install packages,lint,build and Unit testing
working-directory: ./eda-frontend
run: |
export NODE_OPTIONS=--max_old_space_size=4096
npm install
CI=true npm run build
CI=true npm test
3 changes: 2 additions & 1 deletion ArduinoFrontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"src/styles.css"
],
"scripts": [],
"es5BrowserSupport": true
"es5BrowserSupport": true,
"showCircularDependencies": false
},
"configurations": {
"production": {
Expand Down
Loading

0 comments on commit 46464da

Please sign in to comment.