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

Update margins when merging inline fragments #10655

Merged
merged 1 commit into from Apr 17, 2016
Merged

Update margins when merging inline fragments #10655

merged 1 commit into from Apr 17, 2016

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 16, 2016

Fixes #10633. r? @pcwalton

This change is Reviewable
@mbrubeck
Update margins when merging inline fragments
Loading status checks…
782e713 
Fixes #10633.
@SimonSapin
Copy link
Member

SimonSapin commented Apr 16, 2016

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

bors-servo commented Apr 16, 2016

📌 Commit 782e713 has been approved by SimonSapin
@pcwalton
Copy link
Contributor

pcwalton commented Apr 16, 2016

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

bors-servo commented Apr 16, 2016

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #10650
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

📌 Commit 782e713 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

⌛ Testing commit 782e713 with merge 3907c66...
bors-servo added a commit that referenced this pull request Apr 16, 2016
@bors-servo
Auto merge of #10655 - mbrubeck:merge-margin, r=pcwalton
Loading status checks…
3907c66 
Update margins when merging inline fragments

Fixes #10633.  r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10655)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

💔 Test failed - mac-rel-wpt
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 16, 2016

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

bors-servo commented Apr 16, 2016

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

bors-servo commented Apr 17, 2016

💔 Test failed - mac-rel-wpt
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

@bors-servo retry

WebGL conformance failure. Will file when at a computer.
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css are reusable. Rebuilding only mac-rel-wpt...
@KiChjang
Copy link
Member

KiChjang commented Apr 17, 2016

Filed #10660.
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

💔 Test failed - mac-rel-wpt
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

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

bors-servo commented Apr 17, 2016

💣 Failed to start rebuilding: 502 Bad Gateway
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

⌛ Testing commit 782e713 with merge 5a11fc4...
bors-servo added a commit that referenced this pull request Apr 17, 2016
@bors-servo
Auto merge of #10655 - mbrubeck:merge-margin, r=pcwalton
Loading status checks…
5a11fc4 
Update margins when merging inline fragments

Fixes #10633.  r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10655)
<!-- Reviewable:end -->
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

@bors-servo retry
@mbrubeck mbrubeck closed this Apr 17, 2016
@mbrubeck mbrubeck reopened this Apr 17, 2016
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

@bors-servo r-
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

@bors-servo r=SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

📌 Commit 782e713 has been approved by SimonSapin
@frewsxcv frewsxcv closed this Apr 17, 2016
@frewsxcv frewsxcv reopened this Apr 17, 2016
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Apr 17, 2016

@bors-servo force
@KiChjang
Copy link
Member

KiChjang commented Apr 17, 2016

@bors-servo retry clean force
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 17, 2016

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

bors-servo commented Apr 17, 2016

⌛ Testing commit 782e713 with merge fd994c4...
bors-servo added a commit that referenced this pull request Apr 17, 2016
@bors-servo
Auto merge of #10655 - mbrubeck:merge-margin, r=SimonSapin
Loading status checks…
fd994c4 
Update margins when merging inline fragments

Fixes #10633.  r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10655)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 782e713 into servo:master Apr 17, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mbrubeck mbrubeck deleted the mbrubeck:merge-margin branch May 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
@mbrubeck @SimonSapin @bors-servo @pcwalton @KiChjang @larsbergstrom @frewsxcv @highfive
You can’t perform that action at this time.