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

Rubocop -a on lib/jekyll #5666

Merged
merged 3 commits into from Dec 18, 2016

Conversation

Projects
None yet
6 participants
@DirtyF
Member

DirtyF commented Dec 18, 2016

Fix #5665

DirtyF added some commits Dec 18, 2016

@DirtyF DirtyF added the bug label Dec 18, 2016

@DirtyF DirtyF requested a review from envygeeks Dec 18, 2016

Show outdated Hide outdated lib/jekyll/collection.rb
def read_static_file(file_path, full_path)
relative_dir = Jekyll.sanitized_path(
relative_directory,
File.dirname(file_path)
).chomp("/.")
files << StaticFile.new(site, site.source, relative_dir,
File.basename(full_path), self)
File.basename(full_path), self)

This comment has been minimized.

@ashmaroli

ashmaroli Dec 18, 2016

Member

whoa! rubocop did this?
may I suggest: ?

files << StaticFile.new(
  site,
  site.source,
  relative_dir, 
  File.basename(full_path),
  self
)
@ashmaroli

ashmaroli Dec 18, 2016

Member

whoa! rubocop did this?
may I suggest: ?

files << StaticFile.new(
  site,
  site.source,
  relative_dir, 
  File.basename(full_path),
  self
)
@@ -30,8 +30,7 @@ def data
@data
end
def trigger_hooks(*)
end
def trigger_hooks(*); end

This comment has been minimized.

@ashmaroli

ashmaroli Dec 18, 2016

Member

jus curious. why do we have an empty method?

@ashmaroli

ashmaroli Dec 18, 2016

Member

jus curious. why do we have an empty method?

This comment has been minimized.

@pathawks

pathawks Dec 18, 2016

Member

So it can be overridden 👍

@pathawks

pathawks Dec 18, 2016

Member

So it can be overridden 👍

@ashmaroli

This comment has been minimized.

Show comment
Hide comment
@ashmaroli

ashmaroli Dec 18, 2016

Member

noticed this just now.. PRs shouldn't have a bug label.. that's better for issue tickets. PRs should be sporting a bug-fix label instead.. 😃

Member

ashmaroli commented Dec 18, 2016

noticed this just now.. PRs shouldn't have a bug label.. that's better for issue tickets. PRs should be sporting a bug-fix label instead.. 😃

@DirtyF DirtyF requested a review from parkr Dec 18, 2016

@DirtyF DirtyF removed the bug label Dec 18, 2016

@parkr

parkr approved these changes Dec 18, 2016

@DirtyF

This comment has been minimized.

Show comment
Hide comment
@DirtyF

DirtyF Dec 18, 2016

Member

@jekyllbot: merge +dev

Member

DirtyF commented Dec 18, 2016

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 7231088 into jekyll:master Dec 18, 2016

2 checks passed

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

jekyllbot added a commit that referenced this pull request Dec 18, 2016

@DirtyF DirtyF deleted the DirtyF:rubocop-jekyll branch Dec 18, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment