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.

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

Merge changes from Heroku deployment on Master to develop #17

Merged
merged 9 commits into from
Nov 2, 2017

Conversation

bahdcoder
Copy link
Owner

What does this PR do

  • Update the develop branch with the changes made from deploying to heroku

Description of Task to be completed

  • N/A

How should this be manually tested

N/A

Any background context you want to provide ?

N/A

What are the relevant pivotal tracker stories ?

Screenshots

N/A

Questions:

N/A

@@ -4,7 +4,7 @@ const Sequelize = require('sequelize');

const basename = path.basename(__filename);
const env = process.env.NODE_ENV || 'development';
const config = require('./../../config/database.json')[env];
const config = require('./../../config/database.js')[env];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unable to resolve path to module './../../config/database.js' import/no-unresolved

@bahdcoder bahdcoder merged commit b0bc11a into develop Nov 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants