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

add an extra line in rspec template to avoid rubocop errors #653

Merged

Conversation

aditya-cherukuri
Copy link
Contributor

What are you trying to accomplish?

When using the generator to create a new maintenance task and an associated spec I get a rubocop warning about having to add a new line "RuboCop: Add an empty line after magic comments. [Layout/EmptyLineAfterMagicComment]"

@ghost ghost added the cla-needed label Jun 15, 2022
@adrianna-chang-shopify
Copy link
Contributor

Hey @aditya-cherukuri , thanks for the contribution! You'll just need to sign the CLA before we can merge this.

@etiennebarrie
Copy link
Member

Thank you! Good idea. Can you do it for all the templates?

@ghost
Copy link

ghost commented Jun 15, 2022

Hey @aditya-cherukuri , thanks for the contribution! You'll just need to sign the CLA before we can merge this.

Yup, signed one already!

@nvasilevski
Copy link
Contributor

Yup, signed one already!

It seems to expect you to sign CLA as @aditya-cherukuri
Would you mind double-checking? Thanks!

@aditya-cherukuri
Copy link
Contributor Author

Yup, signed one already!

It seems to expect you to sign CLA as @aditya-cherukuri Would you mind double-checking? Thanks!

yeah it gave me an error when I tried to do it again. Let's see if the check passes on this run.

@aditya-cherukuri
Copy link
Contributor Author

aditya-cherukuri commented Jun 15, 2022

@nvasilevski @adrianna-chang-shopify Is the CLA status stuck? It's been quite a while since I pushed the new commit and having signed the CLA

@nvasilevski
Copy link
Contributor

Hey @aditya-cherukuri, I'm sorry for that trouble 🙇 Would you mind doing git commit --amend --no-edit and force pushing the branch? Hopefully this should re-trigger the check. If not I guess we should just merge it without CLA, but I'll need to confirm with the team

@ghost ghost removed the cla-needed label Jun 15, 2022
@aditya-cherukuri
Copy link
Contributor Author

aditya-cherukuri commented Jun 15, 2022

Hey @aditya-cherukuri, I'm sorry for that trouble 🙇 Would you mind doing git commit --amend --no-edit and force pushing the branch? Hopefully this should re-trigger the check. If not I guess we should just merge it without CLA, but I'll need to confirm with the team

Looks like that worked but there are too many commits now. Hopefully you can squash the commits when you merge the pull request or let me know I'll try to squash and force push.

@nvasilevski nvasilevski merged commit cbb77b7 into Shopify:main Jun 16, 2022
@nvasilevski
Copy link
Contributor

Hopefully you can squash the commits

squashed using github UI 👍 Thank you for your contribution!

lawrencewong pushed a commit to lawrencewong/maintenance_tasks that referenced this pull request Apr 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants