From cb84017bbe1eae2bd8accfd83d3cbb5ce3e80437 Mon Sep 17 00:00:00 2001 From: Ralph Date: Mon, 25 Jun 2018 21:43:33 -0400 Subject: [PATCH] Update rubocop version to 0.57.x (#7078) Merge pull request 7078 --- .rubocop.yml | 2 ++ Gemfile | 2 +- lib/jekyll/drops/drop.rb | 6 +----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9edab2bd..81e11e29 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -98,6 +98,8 @@ Security/YAMLLoad: Exclude: - !ruby/regexp /features\/.*.rb/ - !ruby/regexp /test\/.*.rb$/ +Style/AccessModifierDeclarations: + Enabled: false Style/Alias: EnforcedStyle: prefer_alias_method Style/AndOr: diff --git a/Gemfile b/Gemfile index ce43b679..34e9be49 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 0.56.0" + gem "rubocop", "~> 0.57.2" gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__) gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 412c2791..208b266b 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -15,11 +15,7 @@ module Jekyll # # Returns the mutability of the class def self.mutable(is_mutable = nil) - @is_mutable = if is_mutable - is_mutable - else - false - end + @is_mutable = is_mutable || false end def self.mutable?