Skip to content

Add missing parameter #1816

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

Merged
merged 2 commits into from
Oct 20, 2012
Merged

Add missing parameter #1816

merged 2 commits into from
Oct 20, 2012

Conversation

martinqt
Copy link

The file array was missing

The file array was missing
@weaverryan
Copy link
Member

Hi there!

Hmm, can you re-check your PR please? The changeset is quite large - perhaps there's a problem with line-breaks in the commit? Can you see if you can fix that, rebase, and update the PR with the small changeset?

Thanks!

@stof
Copy link
Member

stof commented Oct 17, 2012

@weaverryan you can see the diff without whitespace changes (equivalent of git diff --ignore-space-change) by adding ?w=1 in the url (works for any diff page on github): https://github.com/symfony/symfony-docs/pull/1816/files?w=1

@martinqt
Copy link
Author

I'll try to have a look but I don't really know why git does that.

@martinqt
Copy link
Author

Well, when i commit only the changed line is highlighted (like with ?w=1) but then the all fie is highlighted. If you have any other idea otherwise i don't know how to fix this. Sorry

EDIT: just saw that when you click "files changed", only one line is highlighted.

@stof
Copy link
Member

stof commented Oct 18, 2012

@martinqt you probably changed the line endings (from LF to CRLF or the opposite), whcih indeed marks the lines as chnaged. The doc should be using LF everywhere

Thanks to stof
@martinqt
Copy link
Author

@stof thanks. Hope it's better this way. (and sorry for using windows)

@stof
Copy link
Member

stof commented Oct 18, 2012

@martinqt I'm also using windows. But I configured git to force committing with LF :)

@martinqt
Copy link
Author

The windows part was a joke (well, i'm actually using windows). Yeah, I disbaled it cause every time it asked me to convert and at the time it wasn't a problem (personal repo). Hopefully, I've notepad++ wich did the convert for this file. I'll remember it next time. Thanks

weaverryan added a commit that referenced this pull request Oct 20, 2012
@weaverryan weaverryan merged commit 4640ed8 into symfony:2.0 Oct 20, 2012
@weaverryan
Copy link
Member

Hi guys!

@martinqt thanks for fixing the line endings - I've merged this in!

@stof I think you may know GitHub better than the guys that work at... GitHub. Great tip!

Cheers!

@martinqt
Copy link
Author

You're welcome

@stof
Copy link
Member

stof commented Oct 20, 2012

@weaverryan I simply read their blog. They exposed some secret features 1 year ago, including this one: https://github.com/blog/967-github-secrets

@martinqt
Copy link
Author

I'm wondering if I should open a PR for the others branches. Or is there some kind of (monthly|weekly|...) merge 2.0 -> 2.1 -> master?

@stof
Copy link
Member

stof commented Oct 22, 2012

@martinqt 2.0 is merged into 2.1 and then 2.1 into master on a regular basis (approximately weekly)

@martinqt
Copy link
Author

Ok thanks.

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.

3 participants