[WebProfilerBundle] Fixed profiler seach/homepage with empty token #10820

Merged
merged 3 commits into from Apr 30, 2014

Conversation

Projects
None yet
5 participants
Contributor

tucksaun commented Apr 30, 2014

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #10806
License MIT
Doc PR none

tucksaun added some commits Apr 30, 2014

@tucksaun tucksaun [WebProfilerBundle] Added test case for #10806 7b425d2
@tucksaun tucksaun [WebProfilerBundle] fixed profiler homepage, fixed #10806 5b91e70
@tucksaun tucksaun [WebProfilerBundle] added test case for #10773
16dd0e5
Owner

fabpot commented Apr 30, 2014

Thank you @tucksaun.

fabpot merged commit 16dd0e5 into symfony:2.3 Apr 30, 2014

0 of 2 checks passed

continuous-integration/travis-ci The Travis CI build failed
Details
default Success: fabbot — Failure: Travis
Details

@fabpot fabpot added a commit that referenced this pull request Apr 30, 2014

@fabpot fabpot bug #10820 [WebProfilerBundle] Fixed profiler seach/homepage with emp…
…ty token (tucksaun)

This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] Fixed profiler seach/homepage with empty token

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10806
| License       | MIT
| Doc PR        | none

Commits
-------

16dd0e5 [WebProfilerBundle] added test case for #10773
5b91e70 [WebProfilerBundle] fixed profiler homepage, fixed #10806
7b425d2 [WebProfilerBundle] Added test case for #10806
b471dbe
Contributor

perajovic commented Apr 30, 2014

Shouldn't be merged this PR in 2.4 and master as well?

tucksaun deleted the tucksaun:fix-profiler-seach-with-empty-token branch Apr 30, 2014

Contributor

stloyd commented Apr 30, 2014

@perajovic This is done from time to time, so no need to worry about, it will be done for sure.

Contributor

tucksaun commented Apr 30, 2014

@perajovic 2.3 is regularly merge in 2.4 and 2.4 in master

Contributor

perajovic commented Apr 30, 2014

Yes, I know. But a few moments ago I checked a master's log and it wasn't there. Some previous commit was already merged in all current branches 2.3/2.4/master, so I thought that something is wrong...

Cheers!

Member

stof commented Apr 30, 2014

@perajovic 2.4 was merged into master 5 hours ago. this PR has only been merged 2 hours ago

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment