Skip to content

/ html5ever

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

Properly detect unexpected font start tags in foreign content #161

Merged
merged 1 commit into from Sep 1, 2015
Merged

Properly detect unexpected font start tags in foreign content #161

merged 1 commit into from Sep 1, 2015
+42 −32

Conversation

@nox
Copy link
Member

nox commented Aug 19, 2015

Review on Reviewable
@nox nox mentioned this pull request Aug 19, 2015
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

☔ The latest upstream changes (presumably #153) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the nox:unexpected-foreign-content branch from 5de5998 to acf34c5 Sep 1, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

☔ The latest upstream changes (presumably #156) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the nox:unexpected-foreign-content branch from acf34c5 to 4a843da Sep 1, 2015
@SimonSapin
Copy link
Member

SimonSapin commented Sep 1, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

📌 Commit 4a843da has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

☔ The latest upstream changes (presumably #162) made this pull request unmergeable. Please resolve the merge conflicts.
@nox
Properly detect unexpected font start tags in foreign content
Loading status checks…
dd2d0a6
@nox nox force-pushed the nox:unexpected-foreign-content branch from 4a843da to dd2d0a6 Sep 1, 2015
@SimonSapin
Copy link
Member

SimonSapin commented Sep 1, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

📌 Commit dd2d0a6 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

⌛ Testing commit dd2d0a6 with merge d358a44...
bors-servo pushed a commit that referenced this pull request Sep 1, 2015
bors-servo
Auto merge of #161 - nox:unexpected-foreign-content, r=SimonSapin
Loading status checks…
d358a44 
Properly detect unexpected font start tags in foreign content



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

bors-servo commented Sep 1, 2015

☀️ Test successful - travis
@bors-servo bors-servo merged commit dd2d0a6 into servo:master Sep 1, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the nox:unexpected-foreign-content branch Sep 4, 2015
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
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@nox @bors-servo @SimonSapin
You can’t perform that action at this time.