Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Master into Dev #73

Open
wants to merge 18 commits into
base: dev
Choose a base branch
from
Open

Merge Master into Dev #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
976b94b
Bump redis from 2.8.0 to 3.1.1
dependabot[bot] Apr 27, 2021
b793e5b
Bump handlebars from 4.7.6 to 4.7.7
dependabot[bot] Feb 11, 2022
f7ea6ab
Bump copy-props from 2.0.4 to 2.0.5
dependabot[bot] Jun 27, 2022
9562d11
Bump moment from 2.20.1 to 2.29.4
dependabot[bot] Jul 8, 2022
b7eb368
Merge pull request #54 from iolufemi/dependabot/npm_and_yarn/moment-2…
iolufemi Jul 26, 2022
cb9510d
Merge pull request #53 from iolufemi/dependabot/npm_and_yarn/copy-pro…
iolufemi Jul 26, 2022
d301151
Merge pull request #50 from iolufemi/dependabot/npm_and_yarn/handleba…
iolufemi Jul 26, 2022
1d93b25
Bump minimist from 1.2.5 to 1.2.6
dependabot[bot] Jul 26, 2022
0132acd
Bump trim-off-newlines from 1.0.1 to 1.0.3
dependabot[bot] Jul 26, 2022
27065d9
Bump lodash from 4.17.15 to 4.17.21
dependabot[bot] Jul 26, 2022
baa7022
Bump moment-timezone from 0.5.14 to 0.5.37
dependabot[bot] Aug 31, 2022
6a0a59a
Merge pull request #57 from iolufemi/dependabot/npm_and_yarn/moment-t…
iolufemi Oct 5, 2022
2c1c01f
Merge pull request #56 from iolufemi/dependabot/npm_and_yarn/lodash-4…
iolufemi Oct 5, 2022
4e36747
Merge pull request #55 from iolufemi/dependabot/npm_and_yarn/trim-off…
iolufemi Oct 5, 2022
641f286
Merge pull request #51 from iolufemi/dependabot/npm_and_yarn/minimist…
iolufemi Oct 5, 2022
d1e5ad4
Merge pull request #48 from iolufemi/dependabot/npm_and_yarn/redis-3.1.1
iolufemi Oct 5, 2022
7cef586
updated mongoose and sequelize to the most recent version for mongoDB…
iolufemi Apr 29, 2023
1645428
removed repetition in the model index file
iolufemi Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:

# MySQL
mysqldb:
image: mysql:5.7.26
image: mysql:8.0
restart: always
environment:
- MYSQL_ROOT_PASSWORD=command
Expand Down Expand Up @@ -103,7 +103,7 @@ services:

# Mongo
mongo:
image: mongo:3.6
image: mongo:6.0
restart: always

volumes:
Expand Down
6 changes: 3 additions & 3 deletions models/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ var associate = function(models){
files.forEach(function(file) {
count = count + 1;
var splitFileName = file.split('.');
if(splitFileName[0] !== 'index'){
models[splitFileName[0]] = require('./'+splitFileName[0]);
if (splitFileName[0] !== 'index') {
models[splitFileName[0]] = require('./' + splitFileName[0]);
}
if(count === filesCount){
if (count === filesCount) {
associate(models);
}
});
Expand Down
Loading