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

Show custom cops in --show-cops #3061

Merged
merged 1 commit into from Apr 27, 2016

Conversation

ptarjan
Copy link
Contributor

@ptarjan ptarjan commented Apr 20, 2016

Before submitting a PR make sure the following are checked:

  • Wrote good commit messages.
  • Used the same coding conventions as the rest of the project.
  • Feature branch is up-to-date with master (if not - rebase it)
  • Squashed related commits together.
  • Added tests.
  • Added an entry to the Changelog if the new code introduces user-observable changes. See changelog entry format.
  • All tests are passing.
  • The new code doesn't generate RuboCop offenses.
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences.

@ptarjan ptarjan force-pushed the ptarjan-custom-cop-show-cops branch from ec12cb8 to 9618570 Compare April 20, 2016 08:33
@Neodelf
Copy link
Contributor

Neodelf commented Apr 20, 2016

Damn it! Pull request which resolves the issue was already created. May be I was should make a mark about it?

@bbatsov
Copy link
Collaborator

bbatsov commented Apr 22, 2016

I don't have a preference who's PR we'll merge eventually. It's simply important to fix the issue at hand.

@ptarjan
Copy link
Contributor Author

ptarjan commented Apr 22, 2016

ditto

@Neodelf
Copy link
Contributor

Neodelf commented Apr 22, 2016

I just wanted to draw attention. I apologize if my words seem rude. Only positive! :)

@bbatsov
Copy link
Collaborator

bbatsov commented Apr 22, 2016

@ptarjan Please, rebase this.

@ptarjan ptarjan force-pushed the ptarjan-custom-cop-show-cops branch from 9618570 to 1d0fe09 Compare April 23, 2016 09:04
@ptarjan
Copy link
Contributor Author

ptarjan commented Apr 23, 2016

I'd love to figure out a way to do CHANGELOGs without getting so many merge conflicts.

@bbatsov
Copy link
Collaborator

bbatsov commented Apr 23, 2016

I'd love to figure out a way to do CHANGELOGs without getting so many merge conflicts.

Who wouldn't. :-) Unfortunately all automated solutions produce crappy changelogs and I don't want to write one just before the release.

The build is broken, btw.

@bbatsov
Copy link
Collaborator

bbatsov commented Apr 26, 2016

P.S. I plan to cut a new release soon.

@ptarjan
Copy link
Contributor Author

ptarjan commented Apr 27, 2016

@bbatsov excited for the new cut. I rebased and repushed. That CHANGELOG will be the death of me.

@ptarjan ptarjan force-pushed the ptarjan-custom-cop-show-cops branch from 702b3bb to 56e03ae Compare April 27, 2016 16:59
@bbatsov bbatsov merged commit b2df5b1 into rubocop:master Apr 27, 2016
@bbatsov
Copy link
Collaborator

bbatsov commented Apr 27, 2016

That CHANGELOG will be the death of me.

I don't like dealing with it either, but it's pretty useful at release time. :-)

@ptarjan ptarjan deleted the ptarjan-custom-cop-show-cops branch April 27, 2016 18:52
@ptarjan
Copy link
Contributor Author

ptarjan commented Apr 28, 2016

Agreed, I just wish there was a format which didn't always merge conflict.

Neodelf pushed a commit to Neodelf/rubocop that referenced this pull request Oct 15, 2016
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.

None yet

3 participants