Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork5.3k
Fixing Security Entity Provider tutorial#2765
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
stof commentedJun 24, 2013
FYI, squashing the commit does not require opening a new PR. You can force the push to the same branch. However, I think you messed your squashing as the commit authorship is now attributed to@weaverryan |
gondo commentedJun 24, 2013
yes i've seen that and i have no idea hows that possible :) any suggestion how to change author? |
docteurklein commentedJun 24, 2013
use git rebase -i |
gondo commentedJun 24, 2013
ok i've changed the author but |
stof commentedJun 24, 2013
without the output of |
stof commentedJun 24, 2013
Actually, looking at your repo, it seems like your foxed commit is in the patch-2 branch. But this PR is from the patch-1 branch |
for more info see#2756
gondo commentedJun 24, 2013
ok this should do it |
gondo commentedJun 24, 2013
i've accidentally took 1 commit from weaverryan but its just some design change as you can see. pls dont make me to change it again :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I don't like the first person view here, I think "Below is an export of theuser table containing aadmin user with passwordadmin." (I'm not quite sure whether or not literals should be used here)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
i've just iterated on what was already there. as you can see, i did not change this text just improved it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I know. I'm sorry if I offended you. I was just wondering if you could change this as well. Otherwise, I can open a new pull request on it after this one is merged. Would be fine with either way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
:) no hard feelings. honestly at this stage i would prefer to get this merged as its taking quite some time. i might do this change later today if this will still not be merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
@gondo@weaverryan is the only man who merges stuff, it can take a couple weeks before it get merged
weaverryan commentedJul 1, 2013
Hi@gondo! Phew, ok! So, you had a lot of very nice changes to this entry. I patched your commit (with a little bit of cleanup) into the 2.2 branch at sha:1d00f06. I also made tweaks at sha:7a37651 and sha:c10c405 where I rearranged some of your changes and added even more things to them. You made a lot of nice improvements to this entry, so thank you very much! But handling them was quite difficult and the changes were large. So, I hope you'll contribute in the future, but if you do, smaller pull requests are much easier for me to handle. Thanks! |
gondo commentedJul 1, 2013
thanks. i ll keep that in mind if i ll have further changes. im going through the documentation one by one as im getting familiar with symfony. |
for more info see#2756
squashed commits from pull request#2753
(based on what i found, the only way how to squash commits in pull request on github is to create another pull request)