Skip to content

changelogs missing features after #17589 #18412

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 7, 2016
Merged

changelogs missing features after #17589 #18412

merged 1 commit into from
Apr 7, 2016

Conversation

HeahDude
Copy link
Contributor

@HeahDude HeahDude commented Apr 2, 2016

Q A
Branch? master
License MIT

@HeahDude HeahDude changed the title Minor/changelogs missing features [Framework] changelogs missing features Apr 2, 2016
@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 2, 2016

I added a second commit with cs fixes, as it goes in master it should not be a pain to merge older branches as it would to merge it upward, right ?

@HeahDude HeahDude changed the title [Framework] changelogs missing features changelogs missing features after #17589 Apr 2, 2016
@HeahDude HeahDude force-pushed the minor/changelogs-missing_features branch 2 times, most recently from 0f1de44 to da3e8b0 Compare April 3, 2016 17:18
@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 3, 2016

Updated here, I've forgotten one method...

Is the second commit needed ? I can remove it. Thanks

@nicolas-grekas
Copy link
Member

@HeahDude when a CS fix could be applied on lower branches, it must be applied there.
Which means you can't trick the process this way :)
I'd recommend you revert the last commit, and maybe submit it to the lowest applicable branches.

@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 3, 2016

@nicolas-grekas thanks, since this fixes are needed for a long time I thought it did not happens because it would have been a pain to merge upward from lower branches.

I revert it right away :)

@HeahDude HeahDude force-pushed the minor/changelogs-missing_features branch from da3e8b0 to 26da79c Compare April 3, 2016 17:32
@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 3, 2016

Ready!

xabbuh
xabbuh reviewed Apr 6, 2016
View reviewed changes
src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
3.1.0
-----

* added shortcuts for redirected and forwarded request's profiles in the
Copy link
Member

Choose a reason for hiding this comment

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

I am not sure if everyone will understand what is meant with "shortcut".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right! What about "links" ?

Copy link
Member

Choose a reason for hiding this comment

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

What about "added information about redirected and forwared requests to the profiler"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Simple and efficient! Thanks :)

@HeahDude HeahDude force-pushed the minor/changelogs-missing_features branch from 26da79c to 724fd3b Compare April 6, 2016 18:10
@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 6, 2016

@xabbuh fixed! Thanks.

@xabbuh
Copy link
Member

xabbuh commented Apr 6, 2016

👍

@stof
Copy link
Member

stof commented Apr 7, 2016

I thought it did not happens because it would have been a pain to merge upward from lower branches.

@HeahDude actually, applying a CS fix only to the latest version would make any future upward merge painful due to conflicts.

@HeahDude
Copy link
Contributor Author

HeahDude commented Apr 7, 2016

Good to know!

@fabpot
Copy link
Member

fabpot commented Apr 7, 2016

Thank you @HeahDude.

@fabpot fabpot merged commit 724fd3b into symfony:master Apr 7, 2016
fabpot added a commit that referenced this pull request Apr 7, 2016
@fabpot
minor #18412 changelogs missing features after #17589 (HeahDude)
0d4a533 
This PR was merged into the 3.1-dev branch.

Discussion
----------

changelogs missing features after #17589

| Q             | A
| ------------- | ---
| Branch?       | master
| License       | MIT

Commits
-------

724fd3b updated changelogs after #17589
@HeahDude HeahDude mentioned this pull request Apr 7, 2016
Merged
@HeahDude HeahDude deleted the minor/changelogs-missing_features branch April 7, 2016 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@HeahDude @nicolas-grekas @xabbuh @stof @fabpot @carsonbot