Skip to content

Commit 46464da

Browse files
Merge pull request #359 from frg-fossee/develop
merge develop into master
2 parents e1cdde8 + 584773c commit 46464da

File tree

215 files changed

+18495
-2943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+18495
-2943
lines changed

.env

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ MYSQL_USER=user
3131
MYSQL_PASSWORD=password
3232
MYSQL_ROOT_PASSWORD=password
3333

34-
35-
#MongoDB Config
36-
MONGO_INITDB_ROOT_USERNAME=user
37-
MONGO_INITDB_ROOT_PASSWORD=password
38-
3934
#Docker Image Version Tags
4035
TAG_MYSQL=8.0
4136
TAG_REDIS=alpine3.11
42-
TAG_MONGO=4.2.6
4337

4438
#Production Config
4539
GUNICORN_WORKERS=5
@@ -58,4 +52,4 @@ EMAIL_HOST=smtp.gmail.com
5852
EMAIL_HOST_USER=youremail@gmail.com
5953
EMAIL_HOST_PASSWORD=yourpassword
6054
EMAIL_PORT=587
61-
EMAIL_USE_TLS=True
55+
EMAIL_USE_TLS=True

.github/workflows/reactTestBuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- name: Install packages,lint,build and Unit testing
1919
working-directory: ./eda-frontend
2020
run: |
21+
export NODE_OPTIONS=--max_old_space_size=4096
2122
npm install
2223
CI=true npm run build
2324
CI=true npm test

ArduinoFrontend/angular.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"src/styles.css"
3333
],
3434
"scripts": [],
35-
"es5BrowserSupport": true
35+
"es5BrowserSupport": true,
36+
"showCircularDependencies": false
3637
},
3738
"configurations": {
3839
"production": {

0 commit comments

Comments
 (0)