Skip to content

/ servo

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

Issue #9095: Send a notification when a file load is cancelled. #9121

Merged
merged 1 commit into from Feb 3, 2016
Merged

Issue #9095: Send a notification when a file load is cancelled. #9121

merged 1 commit into from Feb 3, 2016

Conversation

@simartin
Copy link
Contributor

simartin commented Jan 2, 2016

Fixes #9095

Review on Reviewable
@simartin
Copy link
Contributor Author

simartin commented Jan 2, 2016

Note that I did not find any obvious way of testing but I'll try to figure something out
@jdm jdm self-assigned this Jan 6, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2016

☔ The latest upstream changes (presumably #9201) made this pull request unmergeable. Please resolve the merge conflicts.
@simartin
Issue #9095: Send a notification when a file load is cancelled.
Loading status checks…
3f3e505
@simartin simartin force-pushed the simartin:issue_9095 branch from 5b3c265 to 3f3e505 Jan 10, 2016
@jdm jdm removed the S-needs-rebase label Jan 11, 2016
@jdm jdm removed the S-needs-tests label Feb 3, 2016
@jdm
Copy link
Member

jdm commented Feb 3, 2016

Yes, we have no actual code that makes use of the network cancellation code yet.
@jdm
Copy link
Member

jdm commented Feb 3, 2016

@bors-servo: r+
Thanks! Sorry about the long delay!
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

📌 Commit 3f3e505 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

⌛ Testing commit 3f3e505 with merge dcf4218...
bors-servo added a commit that referenced this pull request Feb 3, 2016
@bors-servo
Auto merge of #9121 - simartin:issue_9095, r=jdm
Loading status checks…
dcf4218 
Issue #9095: Send a notification when a file load is cancelled.

Fixes #9095

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

bors-servo commented Feb 3, 2016

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Feb 3, 2016

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

⚡ Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt are reusable. Rebuilding only linux-rel...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 3f3e505 into servo:master Feb 3, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@simartin simartin deleted the simartin:issue_9095 branch Feb 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@simartin @bors-servo @jdm @KiChjang @highfive
You can’t perform that action at this time.