Skip to content

build: consistent line breaks for css files #12977

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
Sep 27, 2018

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Sep 4, 2018

Bumps to stylelint 9.5.0 and enables the line break checking for CSS files.

@crisbeto crisbeto added pr: merge safe target: patch This PR is targeted for the next patch release labels Sep 4, 2018
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Sep 4, 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 and removed pr: merge safe labels Sep 4, 2018
@jelbourn
Copy link
Member

jelbourn commented Sep 4, 2018

Removing merge safe since the last time we removed bad line endings from Google we ran into some problems.

@crisbeto crisbeto force-pushed the css-consistent-line-breaks branch from 2b0b36b to 180fd6b Compare September 10, 2018 20:16
@jelbourn
Copy link
Member

Passes presubmit, just needs rebase

@ngbot
Copy link

ngbot bot commented Sep 14, 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 css-consistent-line-breaks branch from 180fd6b to 762eccb Compare September 14, 2018 19:22
@crisbeto
Copy link
Member Author

Rebased.

@ngbot
Copy link

ngbot bot commented Sep 18, 2018

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

1 similar comment
@ngbot
Copy link

ngbot bot commented Sep 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 css-consistent-line-breaks branch 2 times, most recently from 87e7c9c to a521855 Compare September 21, 2018 20:38
@jelbourn
Copy link
Member

Is the lint error on this one real?

Bumps to stylelint 9.5.0 and enables the line break checking for CSS files.
@crisbeto crisbeto force-pushed the css-consistent-line-breaks branch from a521855 to 36c5dfc Compare September 25, 2018 15:10
@crisbeto
Copy link
Member Author

Seems like it is. I got something similar on another PR, but never figured out why. It's fixed now.

@jelbourn jelbourn merged commit 4e475f9 into angular:master Sep 27, 2018
roboshoes pushed a commit to roboshoes/material2 that referenced this pull request Oct 23, 2018
Bumps to stylelint 9.5.0 and enables the line break checking for CSS files.
@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.

3 participants