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

Inherit Jekyll's rubocop config for consistency #65

Merged
merged 4 commits into from
Jan 24, 2017
Merged

Inherit Jekyll's rubocop config for consistency #65

merged 4 commits into from
Jan 24, 2017

Conversation

DirtyF
Copy link
Member

@DirtyF DirtyF commented Aug 11, 2016

This PR is the result of adding inherit_gem: jekyll: .rubocop.yml to .rubocop.yml and running rubocop -a so that this project follows Jekyll core's coding styles for consistency like other core plugins. This way, as Jekyll's Ruby style changes, so too will this project's.

This PR is the result of adding inherit_gem:\n jekyll: .rubocop.yml to .rubocop.yml and running rubocop -a so that this project follows Jekyll core's coding styles for consistency like other core plugins. This way, as Jekyll's Ruby style changes, so too will this project's.
@alfredxing
Copy link
Member

alfredxing commented Aug 24, 2016

LGTM after a quick glance! @parkr Thoughts on this?

Also, what's up with the failing builds? 😛

@parkr
Copy link
Member

parkr commented Aug 24, 2016 via email

@DirtyF DirtyF closed this Sep 2, 2016
@DirtyF DirtyF reopened this Sep 2, 2016
@DirtyF
Copy link
Member Author

DirtyF commented Sep 2, 2016

What's left to do on this? Trigger a new build? (I tried by closing the PR ans reopening it but it didn't do the trick).

@parkr
Copy link
Member

parkr commented Sep 5, 2016

If the tests are only failing on this branch, then we should update the Travis config here. :)

@paulrobertlloyd
Copy link
Contributor

Does #87 remove a block from this PR getting merged?

@DirtyF
Copy link
Member Author

DirtyF commented Jan 21, 2017

  • ran rubocop -a
  • loose some settings for tests
  • rake test pass 😅
Finished in 0.818618s, 20.7667 runs/s, 47.6413 assertions/s.

17 runs, 39 assertions, 0 failures, 0 errors, 0 skips

/cc @jekyll/archives

Copy link
Member

@parkr parkr left a comment

Choose a reason for hiding this comment

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

With passing tests, :shipit:

@alfredxing
Copy link
Member

It's always funny looking at code you wrote a long time ago 😛

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 14652e6 into jekyll:master Jan 24, 2017
jekyllbot added a commit that referenced this pull request Jan 24, 2017
@DirtyF DirtyF deleted the rubocop branch January 24, 2017 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants