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 #48

Merged
merged 2 commits into from
Oct 21, 2017
Merged

Inherit Jekyll's rubocop config for consistency #48

merged 2 commits into from
Oct 21, 2017

Conversation

DirtyF
Copy link
Member

@DirtyF DirtyF commented Aug 25, 2017

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.

Copy link
Member

@pathawks pathawks left a comment

Choose a reason for hiding this comment

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

Whoops. Looks like we went too far and broke things.

[matched[1].strip, matched[2].strip] if matched && matched.length >= 3
end

private

def context_contains_key?(context, key)
if context.respond_to?(:has_key?)
context.has_key?(key)
Copy link
Member

Choose a reason for hiding this comment

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

Nope. Look at the context; this needs to be has_key

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @pathawks, I kinda suspected this, but script/cibuilddidn't fail locally.

Copy link
Member

@pathawks pathawks left a comment

Choose a reason for hiding this comment

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

And now Travis is passing 🎉

Thanks Frank!

@DirtyF
Copy link
Member Author

DirtyF commented Oct 21, 2017

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 5096794 into jekyll:master Oct 21, 2017
jekyllbot added a commit that referenced this pull request Oct 21, 2017
@DirtyF DirtyF deleted the inherit-rubocop branch October 21, 2017 18:30
@jekyll jekyll locked and limited conversation to collaborators Apr 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants