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

fix(cli): prepare the string of all model settings and use it in the… #2601

Closed
wants to merge 1 commit into from

Conversation

yanamg7
Copy link
Contributor

@yanamg7 yanamg7 commented Mar 17, 2019

… template

prepare the string of all model settings and use it in the template, fix one test and add the new
one to test this case

fix #2522

Checklist

👉 Read and sign the CLA (Contributor License Agreement) 👈

  • npm test passes on your machine
  • New tests added or existing tests modified to cover all changes
  • Code conforms with the style guide
  • API Documentation in code was updated
  • Documentation in /docs/site was updated
  • Affected artifact templates in packages/cli were updated
  • Affected example projects in examples/* were updated

…template

prepare the  string of all model settings and use it in the template, fix one test and add the new
one to test this case

fix loopbackio#2522
Copy link
Member

@bajtos bajtos left a comment

Choose a reason for hiding this comment

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

Thank you for the pull request. Please remove unrelated changes to make the patch easier to review.

import {model, property} from '@loopback/repository';
import {<%= modelBaseClass %>} from '.';
<% } -%>
import {<%= modelBaseClass %>, model, property} from '@loopback/repository';
Copy link
Member

Choose a reason for hiding this comment

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

Please revert unrelated white-space changes.

@@ -1,6 +1,6 @@
{
"name": "@loopback/benchmark",
"version": "1.1.12",
"version": "1.1.13",
Copy link
Member

Choose a reason for hiding this comment

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

Please revert changes in all package-lock files.

I believe we are no longer including LB4 packages in our lock files, see 1d658fb

@dhmlau
Copy link
Member

dhmlau commented Mar 18, 2019

@yanamg7 , i saw you have another PR #2604, possibly for the same purpose. Does it mean this PR should be closed?

Please note that you don't need to open another PR for pushing more changes. Here is a detailed instruction in submitting/modifying a PR: https://loopback.io/doc/en/lb4/submitting_a_pr.html. Thanks.

@yanamg7
Copy link
Contributor Author

yanamg7 commented Mar 19, 2019

Reverted and add new pull request, this one is not relevant already

@yanamg7 yanamg7 closed this Mar 19, 2019
@bajtos
Copy link
Member

bajtos commented Mar 19, 2019

Reverted and add new pull request, this one is not relevant already

In the future, please rebase your existing pull request on top of the new master, DO NOT open new pull requests. That way all relevant discussion stays in a single place.

In case you are not familiar with Git history rewriting, you can learn more in our docs: https://loopback.io/doc/en/contrib/code-contrib.html#how-to-rebase-your-branch.

The important part is to use git rebase.

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.

[CLI] Adding nested configurations to model settings
3 participants