Skip to content

Conversation

@crisbeto
Copy link
Member

@crisbeto crisbeto commented Jul 7, 2018

Fixes a handful of errors that were being thrown by mat-table when it has sticky rows and when it's being used with the native table elements.

Fixes #12094.

@crisbeto crisbeto added the target: patch This PR is targeted for the next patch release label Jul 7, 2018
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jul 7, 2018
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Jul 9, 2018
@ngbot
Copy link

ngbot bot commented Jul 9, 2018

I see that you just added the pr: merge ready label, but the following checks are still failing:
    failure conflicts with base branch "master"

If you want your PR to be merged, it has to pass all the CI checks.

If you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help.

@jelbourn
Copy link
Member

jelbourn commented Jul 9, 2018

@crisbeto just needs rebase

@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from c754111 to 6e7ad7c Compare July 10, 2018 19:22
@crisbeto
Copy link
Member Author

Rebased.

@ngbot
Copy link

ngbot bot commented Jul 12, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from 6e7ad7c to 3c075ea Compare July 13, 2018 16:24
@ngbot
Copy link

ngbot bot commented Jul 18, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from 3c075ea to 10e57f9 Compare July 18, 2018 20:24
@ngbot
Copy link

ngbot bot commented Jul 24, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from 10e57f9 to 9327262 Compare July 24, 2018 17:41
@ngbot
Copy link

ngbot bot commented Aug 21, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from 9327262 to 93a05d8 Compare August 25, 2018 17:17
…erver

Fixes a handful of errors that were being thrown by `mat-table` when it has sticky rows and when it's being used with the native `table` elements.

Fixes angular#12094.
@crisbeto crisbeto force-pushed the 12094/sticky-table-ssr branch from 93a05d8 to 4cf26be Compare August 28, 2018 15:02
@jelbourn jelbourn merged commit 7e67fe9 into angular:master Aug 28, 2018
jelbourn pushed a commit that referenced this pull request Aug 29, 2018
…erver (#12095)

Fixes a handful of errors that were being thrown by `mat-table` when it has sticky rows and when it's being used with the native `table` elements.

Fixes #12094.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

mat-table and server side rendering (Angular Universal)

4 participants