Skip to content
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

Run prettier #1866

Merged
merged 1 commit into from
Aug 8, 2018
Merged

Run prettier #1866

merged 1 commit into from
Aug 8, 2018

Conversation

paulmelnikow
Copy link
Member

This is a follow-on to #1167 which turned prettier on.

Merging this separately so the commit with the tooling change is readable.

@paulmelnikow paulmelnikow added the developer-experience Dev tooling, test framework, and CI label Aug 8, 2018
@shields-ci
Copy link

Warnings
⚠️

This PR modified service code for time but not its test code. That's okay so long as it's refactoring existing code.

⚠️

Found 'assert' statement added in lib/error-helper.spec.js. Please ensure tests are written using Chai expect syntax

⚠️

Found 'assert' statement added in lib/badge-data.spec.js. Please ensure tests are written using Chai expect syntax

Messages
📖

✨ Thanks for your contribution to Shields, @paulmelnikow!

📖

Thanks for contributing to our documentation. We ❤️ our documentarians!

Generated by 🚫 dangerJS

@paulmelnikow paulmelnikow merged commit 7a664ca into badges:master Aug 8, 2018
@shields-deployment
Copy link

This pull request was merged to master branch. Now this change is waiting for deployment.
Deploys usually happen every few weeks. After deployment changes are copied to gh-pages branch.

This badge displays deployment status:

@paulmelnikow paulmelnikow deleted the run-prettier branch August 8, 2018 21:57
@paulmelnikow
Copy link
Member Author

If you run into merge conflicts, here's what I'd suggest:

  1. Merge the parent commit ab051b3 into your branch and resolve any conflicts.
  2. Merge this commit 7a664ca into your branch.
  3. Resolve conflicts with git checkout --ours name-of-affected-file and commit the merge.
  4. Run npm install if you don't already have prettier installed.
  5. Run npm run prettier to pretty your changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
developer-experience Dev tooling, test framework, and CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants