aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-07-31 23:56:05 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:30:00 +0900
commit7ed1fc527e029f47c4ed17136fb1492c9fbdfdc9 (patch)
treea08af2765d0d531c38b98a4d4d9423a1d2490cfd
parentdab944e6ca9ed92ce72d1db4834b32e924d87015 (diff)
downloadruby-7ed1fc527e029f47c4ed17136fb1492c9fbdfdc9.tar.gz
[bundler/bundler] Bump rubocop to 0.74.0
And reenable exclusion because the bug why we added them has been fixed. See https://github.com/rubocop-hq/rubocop/issues/6861. https://github.com/bundler/bundler/commit/bda63fcffc
-rw-r--r--lib/bundler/friendly_errors.rb2
-rw-r--r--lib/bundler/uri_credentials_filter.rb2
-rw-r--r--lib/bundler/yaml_serializer.rb2
-rw-r--r--spec/bundler/support/rubygems_ext.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb
index b93ae68012..45faf02020 100644
--- a/lib/bundler/friendly_errors.rb
+++ b/lib/bundler/friendly_errors.rb
@@ -5,7 +5,7 @@ require_relative "vendored_thor"
module Bundler
module FriendlyErrors
- module_function # rubocop:disable Layout/AccessModifierIndentation
+ module_function
def log_error(error)
case error
diff --git a/lib/bundler/uri_credentials_filter.rb b/lib/bundler/uri_credentials_filter.rb
index 0f6ea4cefa..ee3692268c 100644
--- a/lib/bundler/uri_credentials_filter.rb
+++ b/lib/bundler/uri_credentials_filter.rb
@@ -2,7 +2,7 @@
module Bundler
module URICredentialsFilter
- module_function # rubocop:disable Layout/AccessModifierIndentation
+ module_function
def credential_filtered_uri(uri_to_anonymize)
return uri_to_anonymize if uri_to_anonymize.nil?
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb
index 1965853931..374b3bb5e3 100644
--- a/lib/bundler/yaml_serializer.rb
+++ b/lib/bundler/yaml_serializer.rb
@@ -3,7 +3,7 @@
module Bundler
# A stub yaml serializer that can handle only hashes and strings (as of now).
module YAMLSerializer
- module_function # rubocop:disable Layout/AccessModifierIndentation
+ module_function
def dump(hash)
yaml = String.new("---")
diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb
index b43bc26a5c..b97b5278ce 100644
--- a/spec/bundler/support/rubygems_ext.rb
+++ b/spec/bundler/support/rubygems_ext.rb
@@ -11,7 +11,7 @@ module Spec
"rake" => "~> 12.0",
"ronn" => "~> 0.7.3",
"rspec" => "~> 3.6",
- "rubocop" => "= 0.72.0",
+ "rubocop" => "= 0.74.0",
"rubocop-performance" => "= 1.4.0",
}.freeze