diff options
| author | Bundlerbot <bot@bundler.io> | 2019-08-01 06:55:29 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-08-01 06:55:29 +0000 |
| commit | d7808eae1b1a06e1e3a7be53d99830df2605bb9f (patch) | |
| tree | 5abe03a64b55b61cd64794533c3f57bc7e7d3f01 | |
| parent | 33199fd0a32fe074393fc85f27a37b1f0a1eb85e (diff) | |
| parent | bda63fcffcd35174619f349e34fbed63c647900f (diff) | |
| download | bundler-d7808eae1b1a06e1e3a7be53d99830df2605bb9f.tar.gz | |
Merge #7269
7269: Bump rubocop to 0.74.0 r=hsbt a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was that we are using an outdated rubocop version.
### What was your diagnosis of the problem?
My diagnosis was that we should upgrade, specially because the newest version fixes an issue that made us disable a cop under some situations.
### What is your fix for the problem, implemented in this PR?
My fix is to upgrade rubocop and remove the now unneeded exclusions.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
| -rw-r--r-- | lib/bundler/friendly_errors.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/uri_credentials_filter.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/yaml_serializer.rb | 2 | ||||
| -rw-r--r-- | spec/support/rubygems_ext.rb | 2 |
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/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index b43bc26a5c..b97b5278ce 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/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 |