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

Move sequelize-cli from devDependencies to dependencies, because it is needed to run migrations at run-time #171

Merged
merged 1 commit into from Sep 7, 2019

Conversation

@soulchild
Copy link
Contributor

commented Sep 5, 2019

Fixes #161

@soulchild soulchild force-pushed the soulchild:master branch from 3659931 to 65b937c Sep 5, 2019

@SISheogorath
Copy link
Member

left a comment

Please don't commit the yarn.lock in PRs. We update it on a regular basis in master branch. This only leads to unneeded conflicts and can't be reviewed anyway.

Otherwise 👍 for taking the action on #161

@soulchild soulchild closed this Sep 6, 2019

@soulchild soulchild force-pushed the soulchild:master branch from 65b937c to 529075f Sep 6, 2019

@soulchild soulchild reopened this Sep 6, 2019

@soulchild

This comment has been minimized.

Copy link
Contributor Author

commented Sep 6, 2019

Well, that didn't quite work. 😞

Can you manually retrigger the reviewing process? I got rid of my last commit and pushed a new version with just the package.json updated.

@SISheogorath

This comment has been minimized.

Copy link
Member

commented Sep 6, 2019

You can do so by doing git stash && git commit --amend --no-edit && git push -f && git stash pop

This will:

  1. Get your changes out of the way
  2. Redo your last commit
  3. Force push it here
  4. restore your changes

But since you use the master branch you might need to check your git repository to allow force pushing to the master branch.

In future I would recommend to use a separate branch (created by git checkout -b myNewBranchName) since this makes it easier to develop for you :)

@SISheogorath SISheogorath added the bug label Sep 6, 2019

@SISheogorath SISheogorath added this to the Release 1.5.1 milestone Sep 6, 2019

Move sequelize-cli from devDependencies to dependencies, because it i…
…s needed to run migrations at run-time

Signed-off-by: Tobias Kremer <tobias.kremer@gmail.com>

@soulchild soulchild force-pushed the soulchild:master branch from 0b92053 to ea3c824 Sep 6, 2019

@SISheogorath SISheogorath merged commit c6e4f37 into codimd:master Sep 7, 2019

4 checks passed

DCO DCO
Details
WIP Ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk - package.json (codimd) No new issues
Details
@SISheogorath

This comment has been minimized.

Copy link
Member

commented Sep 7, 2019

Thanks a lot for you work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.