Skip to content
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

#1210: add different statements metric to the Web Profiler Toolbar #1211

Conversation

lomby92
Copy link
Contributor

@lomby92 lomby92 commented Sep 19, 2020

Resolve #1210

@lomby92 lomby92 force-pushed the 1210-add-different-statements-to-web-profiler-toolbar branch from 0fa67db to d71ffea Compare September 26, 2020 07:29
@ostrolucky ostrolucky added this to the 2.2.0 milestone Sep 26, 2020
@greg0ire greg0ire closed this Sep 26, 2020
@greg0ire greg0ire reopened this Sep 26, 2020
@greg0ire
Copy link
Member

#1216 has been merged, let's restart the build.

@ostrolucky
Copy link
Member

you would have to rebase

@greg0ire
Copy link
Member

I don't understand why but it looks like you're right… I mean the new build should be run on the result of the merge of this commit and the current master, shouldn't it?

@ostrolucky
Copy link
Member

ostrolucky commented Sep 26, 2020

nope, it's normal checkout branch and running tests

@greg0ire
Copy link
Member

Weird… I will rebase.

@greg0ire
Copy link
Member

greg0ire commented Sep 26, 2020

Actually, it's not a normal checkout, the build is run on refs/pull/1211/merge which should be ae1a885, but is instead 49af01d, apparently.

UPD: that's two commits with the same parents 🤔 (including b58b244, which has my fix)

@greg0ire
Copy link
Member

Oh but the issue is not the same as before!

@greg0ire
Copy link
Member

greg0ire commented Sep 26, 2020

#1216 was not enough to fix the build, it was still failing: https://travis-ci.org/github/doctrine/DoctrineBundle/jobs/730485161

I worked on that at #1218

This PR has CS issues, that's why the build is failing… 🤦 weird that the merge up PR did not have the same issues…

@ostrolucky ostrolucky closed this Sep 26, 2020
@ostrolucky ostrolucky reopened this Sep 26, 2020
@greg0ire greg0ire closed this Sep 26, 2020
@greg0ire greg0ire reopened this Sep 26, 2020
@greg0ire
Copy link
Member

Please associate your email address with your Github account, or change the
email in your commits to an address already associated with it. If you do not
want to expose your personal email address, you may use
lomby92@users.noreply.github.com, that way we can still reach you through Github.
Additionally, you will get credit for this contribution on your Github profile.

@lomby92 lomby92 force-pushed the 1210-add-different-statements-to-web-profiler-toolbar branch from d71ffea to 0c96f93 Compare September 28, 2020 06:30
@greg0ire greg0ire merged commit 39dc82d into doctrine:master Sep 29, 2020
@greg0ire
Copy link
Member

Thanks @lomby92 !

@lomby92
Copy link
Contributor Author

lomby92 commented Sep 29, 2020

Thank you too!

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.

None yet

3 participants