Skip to content

Commit 90da071

Browse files
skipkayhildhh
andauthored
bundle update rubocop --conservative (rails#50515)
Also perform two autocorrects with `bundle exec rubocop -A`: - fixes a new case of [`Style/RedundantReturn`][1] - fixes a new case of [`Performance/StringInclude`][2] [1]: 146b1c2 [2]: 3158bbb Co-authored-by: David Heinemeier Hansson <[email protected]>
1 parent 66615ac commit 90da071

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Gemfile.lock

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,29 +445,28 @@ GEM
445445
retriable (3.1.2)
446446
rexml (3.2.6)
447447
rouge (4.2.0)
448-
rubocop (1.57.0)
449-
base64 (~> 0.1.1)
448+
rubocop (1.59.0)
450449
json (~> 2.3)
451450
language_server-protocol (>= 3.17.0)
452451
parallel (~> 1.10)
453452
parser (>= 3.2.2.4)
454453
rainbow (>= 2.2.2, < 4.0)
455454
regexp_parser (>= 1.8, < 3.0)
456455
rexml (>= 3.2.5, < 4.0)
457-
rubocop-ast (>= 1.28.1, < 2.0)
456+
rubocop-ast (>= 1.30.0, < 2.0)
458457
ruby-progressbar (~> 1.7)
459458
unicode-display_width (>= 2.4.0, < 3.0)
460-
rubocop-ast (1.29.0)
459+
rubocop-ast (1.30.0)
461460
parser (>= 3.2.1.0)
462461
rubocop-md (1.2.0)
463462
rubocop (>= 1.0)
464463
rubocop-minitest (0.29.0)
465464
rubocop (>= 1.39, < 2.0)
466465
rubocop-packaging (0.5.2)
467466
rubocop (>= 1.33, < 2.0)
468-
rubocop-performance (1.16.0)
469-
rubocop (>= 1.7.0, < 2.0)
470-
rubocop-ast (>= 0.4.0)
467+
rubocop-performance (1.20.1)
468+
rubocop (>= 1.48.1, < 2.0)
469+
rubocop-ast (>= 1.30.0, < 2.0)
471470
rubocop-rails (2.18.0)
472471
activesupport (>= 4.2.0)
473472
rack (>= 1.1)

actionpack/test/controller/routing_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ def test_route_with_subdomain_and_constraints_must_receive_params
16941694
set.draw do
16951695
get "page/:name" => "pages#show", :constraints => lambda { |request|
16961696
name_param = request.params[:name]
1697-
return true
1697+
true
16981698
}
16991699
end
17001700
assert_equal({ controller: "pages", action: "show", name: "mypage" },

actionview/lib/action_view/helpers/url_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ def link_to_remote_options?(options)
784784
end
785785

786786
def add_method_to_attributes!(html_options, method)
787-
if method_not_get_method?(method) && !html_options["rel"]&.match?(/nofollow/)
787+
if method_not_get_method?(method) && !html_options["rel"]&.include?("nofollow")
788788
if html_options["rel"].blank?
789789
html_options["rel"] = "nofollow"
790790
else

0 commit comments

Comments
 (0)