Skip to content

chore: use table examples for demo app #11113

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
Merged
merged 1 commit into from
May 10, 2018
Merged

chore: use table examples for demo app #11113

merged 1 commit into from
May 10, 2018

Conversation

andrewseguin
Copy link
Contributor

Based off #11112

Updates the table page on the demo app to depend more on table examples. Still would like to migrate the remaining ones over

@andrewseguin andrewseguin requested a review from jelbourn May 2, 2018 21:12
@andrewseguin andrewseguin requested a review from amcdnl as a code owner May 2, 2018 21:12
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label May 2, 2018
@andrewseguin andrewseguin force-pushed the demo-table-examples-update branch 2 times, most recently from 3262fd3 to 8ac3ca6 Compare May 2, 2018 21:33
jelbourn
jelbourn approved these changes May 2, 2018
View reviewed changes
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

This doesn't look like sticky headers....

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels May 2, 2018
@josephperrott josephperrott added pr: needs rebase and removed action: merge The PR is ready for merge by the caretaker labels May 3, 2018
@ngbot
Copy link

ngbot bot commented May 3, 2018

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

@andrewseguin andrewseguin changed the title Demo table examples update chore: use table examples for demo app May 8, 2018
@andrewseguin andrewseguin force-pushed the demo-table-examples-update branch from 8ac3ca6 to 46ddc92 Compare May 8, 2018 16:55
@andrewseguin andrewseguin added action: merge The PR is ready for merge by the caretaker and removed pr: needs rebase labels May 8, 2018
@ngbot
Copy link

ngbot bot commented May 8, 2018

I see that you just added the pr: merge ready label, but the following checks are still failing:
    failure forbidden label detected: pr: needs*
    pending status "ci/circleci: build" is pending
    pending status "continuous-integration/travis-ci/pr" is pending
    pending 1 pending code review

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 May 8, 2018

@andrewseguin looks like this has real failures on CI

@jelbourn jelbourn removed the action: merge The PR is ready for merge by the caretaker label May 8, 2018
@andrewseguin andrewseguin force-pushed the demo-table-examples-update branch 2 times, most recently from 2c23113 to 9435daf Compare May 8, 2018 18:07
@andrewseguin
Copy link
Contributor Author

Looks like it caught a real rebase issue, thanks CI. Should be all set now

@andrewseguin andrewseguin added action: merge The PR is ready for merge by the caretaker and removed action: merge The PR is ready for merge by the caretaker labels May 8, 2018
@andrewseguin
Copy link
Contributor Author

Note, not merge ready until #11112 is in

@andrewseguin andrewseguin force-pushed the demo-table-examples-update branch 2 times, most recently from ff87b4c to dc0c4f4 Compare May 8, 2018 20:30
@jelbourn
Copy link
Member

jelbourn commented May 9, 2018

@andrewseguin needs rebase now that the dependency is in

@ngbot
Copy link

ngbot bot commented May 9, 2018

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

@andrewseguin andrewseguin force-pushed the demo-table-examples-update branch from dc0c4f4 to 4897aad Compare May 9, 2018 19:37
@andrewseguin andrewseguin added the action: merge The PR is ready for merge by the caretaker label May 9, 2018
@ngbot
Copy link

ngbot bot commented May 9, 2018

I see that you just added the pr: merge ready label, but the following checks are still failing:
    failure status "branch manager" is failing
    pending status "ci/circleci: build" is pending
    pending status "continuous-integration/travis-ci/pr" is pending

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.

@andrewseguin
Copy link
Contributor Author

Thanks, rebased

@jelbourn jelbourn merged commit 4d6bb0d into angular:master May 10, 2018
@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 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jelbourn jelbourn jelbourn approved these changes

@amcdnl amcdnl Awaiting requested review from amcdnl

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andrewseguin @jelbourn @googlebot @josephperrott