Rubocop: Low hanging fruit #4936

Merged
merged 1 commit into from May 25, 2016

Conversation

Projects
None yet
3 participants
@pathawks
Member

pathawks commented May 24, 2016

This PR removes files from the exclude list that are either already passing or can be automatically fixed by Rubocop
#4885

@@ -23,7 +23,7 @@ def require_if_present(names, &block)
require name
rescue LoadError
Jekyll.logger.debug "Couldn't load #{name}. Skipping."
- block.call(name) if block
+ yield(name) if block

This comment has been minimized.

@parkr

parkr May 25, 2016

Member

I think for this you have to remove the &block argument?

@parkr

parkr May 25, 2016

Member

I think for this you have to remove the &block argument?

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

@pathawks, you're my hero! ❤️

@jekyllbot: merge +dev

Member

parkr commented May 25, 2016

@pathawks, you're my hero! ❤️

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 3292850 into jekyll:master May 25, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jekyllbot added a commit that referenced this pull request May 25, 2016

parkr added a commit that referenced this pull request May 25, 2016

@pathawks pathawks deleted the pathawks:passing branch May 25, 2016

parkr added a commit that referenced this pull request May 25, 2016

Merge branch 'master' into pathawks-fp/jsonify-drops
* master: (38 commits)
  Mention where it came from. [ci skip]
  Update history to reflect merge of #4944 [ci skip]
  Update history to reflect merge of #4943 [ci skip]
  Mention where it came from. [ci skip]
  Update history to reflect merge of #4942 [ci skip]
  Update history to reflect merge of #4941
  External: remove &block arg, use block_given?
  Update history to reflect merge of #4936 [ci skip]
  lib/jekyll.rb: require document_drop to ease our pain
  Sort the results of the require_all glob.
  Rubocop fixes
  Reset {{ layout }} between each render & merge layout data properly
  Add failing test for layout data inheritance bug (#4433)
  Add failing test for layout bug (#4897)
  Fix tests for plugins in configuration.
  Define Drop#each so we can use the new frozen/duping behavior
  Don't default 'include' and 'exclude' to an empty array
  Fix some minor things in the tests
  Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
  Remove merge conflicts I forgot to fix.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment