-
-
Notifications
You must be signed in to change notification settings - Fork 10k
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
Update Rubocop to 0.51.0 #6444
Update Rubocop to 0.51.0 #6444
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
--- | ||
AllCops: | ||
TargetRubyVersion: 2.0 | ||
TargetRubyVersion: 2.1 | ||
Include: | ||
- lib/**/*.rb | ||
Exclude: | ||
|
@@ -117,8 +117,6 @@ Style/Documentation: | |
- !ruby/regexp /features\/.*.rb$/ | ||
Style/DoubleNegation: | ||
Enabled: false | ||
Style/Encoding: | ||
EnforcedStyle: when_needed | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd like us to have the special encoding header on all our files if possible. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The related Rubocop commit: rubocop/rubocop@5faf140 |
||
Style/GuardClause: | ||
Enabled: false | ||
Style/HashSyntax: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -96,7 +96,7 @@ def watch(site, options) | |
) | ||
end | ||
end | ||
end # end of class << self | ||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
end | ||
end | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,7 +207,7 @@ def read_config_files(files) | |
rescue ArgumentError => err | ||
Jekyll.logger.warn "WARNING:", "Error reading configuration. " \ | ||
"Using defaults (and options)." | ||
$stderr.puts err | ||
warn err | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can these be changed to use Jekyll's logger instead? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if we could just append it to the string we are already logging? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Revisiting this, I'm not sure if we should be changing an outcome of a public method.. (..in the rare case someone's capturing So I think its best that we stick to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it be changing behavior? I'm sure our logger outputs to stderr, right? |
||
end | ||
|
||
configuration.fix_common_issues.backwards_compatibilize.add_default_collections | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,7 +47,7 @@ def block_code(code, lang) | |
end | ||
|
||
module WithRouge | ||
def block_code(code, lang) | ||
def block_code(_code, lang) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm... this looks like a Rubocop bug, as There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @pathawks it doesn't look like a Rubocop bug to me since if you look at There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You are right! It is doing exactly what it’s supposed to do. We don’t need this. |
||
code = "<pre>#{super}</pre>" | ||
|
||
"<div class=\"highlight\">#{add_code_tags(code, lang)}</div>" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# coding: utf-8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
# frozen_string_literal: true | ||
|
||
require "helper" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# encoding: UTF-8 | ||
# frozen_string_literal: true | ||
|
||
require "helper" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# coding: utf-8 | ||
# frozen_string_literal: true | ||
|
||
require "helper" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# encoding: utf-8 | ||
# frozen_string_literal: true | ||
|
||
require "helper" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Jekyll itself dropped support for
2.0
. So this is in sync..