search

spring-attic / tut-react-and-spring-data-rest

React.js and Spring Data REST :: A tutorial based on the 5-part blog series by Greg Turnquist
https://spring.io/guides/tutorials/react-and-spring-data-rest
882 stars 1.57k forks source link

issue 61 added annotation that links manager to employee after update, also propagated the loggedInManager through the ReactJS classes #68

Closed jpizagno closed 6 years ago

jpizagno commented 7 years ago

This edit has been confirmed by another user to fix the update. please accept pull request.

pivotal-issuemaster commented 7 years ago

@jpizagno Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

pivotal-issuemaster commented 7 years ago

@jpizagno Thank you for signing the Contributor License Agreement!

gregturn commented 6 years ago

I like this pull request @jpizagno. Would you consider squashing this into one commit and rebasing against master?

jpizagno commented 6 years ago

OK. I have squashed into 1 commit which can be seen above. I think it would be easier to create a new pull request, rather than rebase into master. @gregturn can I just create a new pull request?

gregturn commented 6 years ago

Sure!

jpizagno commented 6 years ago

@gregturn I did not create a new pull request. I did rebase to master, and can see the recent commits from you in my pull-request. Can you please accept this pull request? :>

Here is exactly how I rebased 

 git clone https://github.com/jpizagno/tut-react-and-spring-data-rest.git
 cd tut-react-and-spring-data-rest
 git remote add spring-guides https://github.com/spring-guides/tut-react-and-spring-data-rest.git
 git fetch spring-guides
 git rebase spring-guides/master
 git config --global push.default simple
 git push -f

After doing this, I could see the CI build run again here.

gregturn commented 6 years ago

Resolved via https://github.com/spring-guides/tut-react-and-spring-data-rest/commit/894a39e961dee95d0a7469d7a7eb87b3f2ae783a.

Thanks @jpizagno !

jpizagno commented 6 years ago

@gregturn I am glad I could help. Do I get listed as a contributor?

@gregturn sorry about this. However, I did this from an AWS ec2-user account, and forgot to add my proper email. Would you please change the git history emails on master? Here is an example on how to do that: https://help.github.com/articles/changing-author-info/

OLD_EMAIL="ec2-user@ip-172-31-20-228.eu-central-1.compute.internal" CORRECT_NAME="James Pizagno" CORRECT_EMAIL="jpizagno@gmail.com"

https://help.github.com/articles/changing-author-info/

sorry about that @jpizagno

gregturn commented 6 years ago

Okay, I used that tip and tweaked the repository. In general, I would not have done that. At least not for a portfolio project. But an isolated tutorial repository was okay.

jpizagno commented 6 years ago

Greg. Thanks. Again, I am sorry, and will not make that mistake again. If it makes you feel any better, then I am very proud to have contributed to your project. It made my day!