Skip to content

Commit b347dea

Browse files
committed
Merge remote-tracking branch 'origin/master' into add_solargraph
2 parents ab4beba + d55ffce commit b347dea

File tree

13 files changed

+3
-13
lines changed

13 files changed

+3
-13
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Naming/FileName:
7070

7171
# Renaming `has_something?` to `something?` obfuscates whether it is a "is-a" or
7272
# a "has-a" relationship.
73-
Naming/PredicateName:
73+
Naming/PredicatePrefix:
7474
Enabled: false
7575

7676
# commit_sha1 is indeed how we want to write such a variable, so ignore this cop

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gem 'simplecov-lcov', '~> 0.8.0'
1515
if RUBY_VERSION < '2.7.0'
1616
gem 'rubocop', '1.50.0'
1717
else
18-
gem 'rubocop', '1.59.0'
18+
gem 'rubocop', '1.77.0'
1919
end
2020

2121
gem 'ffi' if Gem.win_platform?

lib/overcommit/hook/pre_commit/scalastyle.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def run
2424
extract_messages(
2525
messages,
2626
MESSAGE_REGEX,
27-
lambda { |type| type.to_sym }
27+
lambda(&:to_sym)
2828
)
2929
end
3030
end

template-dir/hooks/commit-msg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/overcommit-hook

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/post-checkout

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/post-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/post-merge

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/post-rewrite

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

template-dir/hooks/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if gemfile
4242
exit 78 # EX_CONFIG
4343
end
4444
end
45-
# rubocop:enable Style/RescueModifier
4645

4746
begin
4847
require 'overcommit'

0 commit comments

Comments
 (0)