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.

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

Allow list markers to contain multiple fragments #7041

Merged
merged 1 commit into from Aug 7, 2015
Merged

Allow list markers to contain multiple fragments #7041

merged 1 commit into from Aug 7, 2015

Conversation

mbrubeck
Copy link
Contributor

@mbrubeck mbrubeck commented Aug 6, 2015

Fixes #6913. r? @pcwalton

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 6, 2015
@pcwalton
Copy link
Contributor

pcwalton commented Aug 6, 2015

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 2ca5df7 has been approved by pcwalton

@jdm jdm added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 6, 2015
@jdm
Copy link
Member

jdm commented Aug 6, 2015

No test?

@mbrubeck
Copy link
Contributor Author

mbrubeck commented Aug 6, 2015

No test?

Oh, right. I wasn't able to reproduce this (possibly because of fonts as noted in #6913). If someone who can reproduce the problem can create a reduced test case, we can add it as a reftest.

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #7021) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm jdm added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 7, 2015
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 7, 2015
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Aug 7, 2015

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

📌 Commit 4e8d2b0 has been approved by pcwalton

@mbrubeck mbrubeck added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Aug 7, 2015
@bors-servo
Copy link
Contributor

⌛ Testing commit 4e8d2b0 with merge 568bd92...

bors-servo pushed a commit that referenced this pull request Aug 7, 2015
Auto merge of #7041 - mbrubeck:marker_fragments, r=pcwalton
568bd92 
Allow list markers to contain multiple fragments

Fixes #6913. r? @pcwalton

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7041)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3

@bors-servo bors-servo merged commit 4e8d2b0 into servo:master Aug 7, 2015
@mbrubeck mbrubeck deleted the marker_fragments branch May 11, 2016 03:43
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
S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mbrubeck @pcwalton @bors-servo @jdm @highfive