Skip to content

ci: allow typography mixins to normalize config #21243

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

Merged
merged 1 commit into from
Dec 11, 2020

Conversation

mmalerba
Copy link
Contributor

@mmalerba mmalerba commented Dec 7, 2020

No description provided.

@mmalerba mmalerba added the merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note label Dec 7, 2020
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 7, 2020
@mmalerba mmalerba requested a review from a team as a code owner December 7, 2020 20:33
@mmalerba mmalerba added the target: patch This PR is targeted for the next patch release label Dec 7, 2020
@mmalerba
Copy link
Contributor Author

mmalerba commented Dec 8, 2020

Comments addressed, PTAL

Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

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

LGTM

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Dec 8, 2020
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.

Overall LGTM, but it would be good to expand the commit message with more context for the change

@mmalerba
Copy link
Contributor Author

mmalerba commented Dec 9, 2020

Updated commit message, removed the change for some mixins that caused failures in google3 (they will be updated in separate PRs)

@mmalerba mmalerba force-pushed the typog-norm branch 3 times, most recently from fb7d76d to f1ed31a Compare December 10, 2020 19:29
@mmalerba mmalerba changed the title fix(material/core): allow mixins to handle 2018 typography configs ci: allow typography mixins to normalize config Dec 11, 2020
@mmalerba
Copy link
Contributor Author

This is proving too difficult to merge, so I'm going to break it out into separate PRs per component. This one is now merge safe because it just changes the lint check

@mmalerba mmalerba added merge safe and removed merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note labels Dec 11, 2020
@mmalerba mmalerba merged commit 8fc6aec into angular:master Dec 11, 2020
mmalerba added a commit that referenced this pull request Dec 11, 2020
@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 Jan 11, 2021
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.

3 participants