Update rubocop to version 1.76.0 (#34926)
This commit is contained in:
parent
1fdcaaebbb
commit
1297ad759e
10 changed files with 14 additions and 11 deletions
|
@ -1,3 +1,6 @@
|
||||||
---
|
---
|
||||||
Naming/BlockForwarding:
|
Naming/BlockForwarding:
|
||||||
EnforcedStyle: explicit
|
EnforcedStyle: explicit
|
||||||
|
|
||||||
|
Naming/PredicateMethod:
|
||||||
|
Enabled: false
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This configuration was generated by
|
# This configuration was generated by
|
||||||
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
|
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
|
||||||
# using RuboCop version 1.75.8.
|
# using RuboCop version 1.76.0.
|
||||||
# The point is for the user to remove these configuration records
|
# The point is for the user to remove these configuration records
|
||||||
# one by one as the offenses are removed from the code base.
|
# one by one as the offenses are removed from the code base.
|
||||||
# Note that changes in the inspected code, or installation of new
|
# Note that changes in the inspected code, or installation of new
|
||||||
|
|
|
@ -751,7 +751,7 @@ GEM
|
||||||
rspec-mocks (~> 3.0)
|
rspec-mocks (~> 3.0)
|
||||||
sidekiq (>= 5, < 9)
|
sidekiq (>= 5, < 9)
|
||||||
rspec-support (3.13.3)
|
rspec-support (3.13.3)
|
||||||
rubocop (1.75.8)
|
rubocop (1.76.0)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (~> 3.17.0.2)
|
language_server-protocol (~> 3.17.0.2)
|
||||||
lint_roller (~> 1.1.0)
|
lint_roller (~> 1.1.0)
|
||||||
|
@ -759,10 +759,10 @@ GEM
|
||||||
parser (>= 3.3.0.2)
|
parser (>= 3.3.0.2)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
regexp_parser (>= 2.9.3, < 3.0)
|
regexp_parser (>= 2.9.3, < 3.0)
|
||||||
rubocop-ast (>= 1.44.0, < 2.0)
|
rubocop-ast (>= 1.45.0, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 4.0)
|
unicode-display_width (>= 2.4.0, < 4.0)
|
||||||
rubocop-ast (1.44.1)
|
rubocop-ast (1.45.0)
|
||||||
parser (>= 3.3.7.2)
|
parser (>= 3.3.7.2)
|
||||||
prism (~> 1.4)
|
prism (~> 1.4)
|
||||||
rubocop-capybara (2.22.1)
|
rubocop-capybara (2.22.1)
|
||||||
|
|
|
@ -138,7 +138,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
|
||||||
set_locale { render :rules }
|
set_locale { render :rules }
|
||||||
end
|
end
|
||||||
|
|
||||||
def is_flashing_format? # rubocop:disable Naming/PredicateName
|
def is_flashing_format? # rubocop:disable Naming/PredicatePrefix
|
||||||
if params[:action] == 'create'
|
if params[:action] == 'create'
|
||||||
false # Disable flash messages for sign-up
|
false # Disable flash messages for sign-up
|
||||||
else
|
else
|
||||||
|
|
|
@ -22,7 +22,7 @@ module Attachmentable
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
included do
|
included do
|
||||||
def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicateName
|
def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicatePrefix
|
||||||
super
|
super
|
||||||
|
|
||||||
send(:"before_#{name}_validate", prepend: true) do
|
send(:"before_#{name}_validate", prepend: true) do
|
||||||
|
|
|
@ -17,7 +17,7 @@ module UserSettings::Glue
|
||||||
self.class.definition_for(key)&.type
|
self.class.definition_for(key)&.type
|
||||||
end
|
end
|
||||||
|
|
||||||
def has_attribute?(key) # rubocop:disable Naming/PredicateName
|
def has_attribute?(key) # rubocop:disable Naming/PredicatePrefix
|
||||||
self.class.definition_for?(key)
|
self.class.definition_for?(key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,7 +21,7 @@ Rails.application.configure do
|
||||||
|
|
||||||
config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') do
|
config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') do
|
||||||
if Rails.env.production?
|
if Rails.env.production?
|
||||||
"ws#{https ? 's' : ''}://#{web_host}"
|
"ws#{'s' if https}://#{web_host}"
|
||||||
else
|
else
|
||||||
"ws://#{host.split(':').first}:4000"
|
"ws://#{host.split(':').first}:4000"
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,7 +32,7 @@ Rails.application.config.content_security_policy do |p|
|
||||||
|
|
||||||
if Rails.env.development?
|
if Rails.env.development?
|
||||||
vite_public_host = ENV.fetch('VITE_DEV_SERVER_PUBLIC', "localhost:#{ViteRuby.config.port}")
|
vite_public_host = ENV.fetch('VITE_DEV_SERVER_PUBLIC', "localhost:#{ViteRuby.config.port}")
|
||||||
front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{ViteRuby.config.https ? 's' : ''}://#{vite_public_host}" }
|
front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{'s' if ViteRuby.config.https}://#{vite_public_host}" }
|
||||||
|
|
||||||
p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
|
p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
|
||||||
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
|
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
|
||||||
|
|
|
@ -23,7 +23,7 @@ module Mastodon
|
||||||
|
|
||||||
def announce_countdown
|
def announce_countdown
|
||||||
WARNING_SECONDS.downto(1) do |i|
|
WARNING_SECONDS.downto(1) do |i|
|
||||||
say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
|
say "Continuing in #{i} second#{'s' unless i == 1}...", true
|
||||||
sleep 1
|
sleep 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -75,7 +75,7 @@ module Mastodon
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_agent
|
def user_agent
|
||||||
@user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
|
@user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{'s' if Rails.configuration.x.use_https}://#{Rails.configuration.x.web_domain}/)"
|
||||||
end
|
end
|
||||||
|
|
||||||
def version_configuration
|
def version_configuration
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue