Downgrade rubocop 0.48.1 => 0.46.0 (#2628)

* downgrade rubocop 0.48.1 => 0.46.0

* exclude vendor/**/* from rubocop target files

* add frozen_string_literal comment line

* fix percent literal delimited by ( and )

* fix alignment

* remove comment disabling unknown cop

diff --git a/.rubocop.yml b/.rubocop.yml
index ab28c0fe1b0092e97508cdd7778e56fea05b5b07..bc43fee81a0157f409b9826879593560d7640ff9 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -88,3 +88,4 @@ AllCops:
   - 'Rakefile'
   - 'node_modules/**/*'
   - 'Vagrantfile'
+  - 'vendor/**/*'

diff --git a/Capfile b/Capfile
index 5bbf6933bd1ca22a8a1605b645ae0b63973127f1..93d78e10719a9c56cdd7c521f17a4174f8b673ad 100644 (file)
--- a/Capfile
+++ b/Capfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'capistrano/setup'
 require 'capistrano/deploy'
 require 'capistrano/scm/git'

diff --git a/Gemfile b/Gemfile
index 7ea358e815b16540c64b2c35943e8f66296a8fec..fea35daf15c2f7b9e92d691f86fcd59892cdbe0b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -83,7 +83,7 @@ group :test do
 end
 
 group :development do
-  gem 'rubocop', require: false
+  gem 'rubocop', '0.46.0', require: false
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'letter_opener'

diff --git a/Gemfile.lock b/Gemfile.lock
index b519f2d6225f9a0f6ee5b96d02b40ff539cf35fa..9f9b6728c7f44fadd732378b4bdd146182a62b40 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -394,8 +394,8 @@ GEM
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -547,7 +547,7 @@ DEPENDENCIES
   rqrcode
   rspec-rails
   rspec-sidekiq
-  rubocop
+  rubocop (= 0.46.0)
   ruby-oembed
   sanitize
   sass-rails (~> 5.0)

diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
index f00646e204f1049a6c6e5515fef85eb520c3be58..b15883d58351d8936368288e938d14cae7846445 100644 (file)
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -44,7 +44,7 @@ class AuthorizeFollowsController < ApplicationController
   end
 
   def acct_param_is_url?
-    parsed_uri.path && %w[http https].include?(parsed_uri.scheme)
+    parsed_uri.path && %w(http https).include?(parsed_uri.scheme)
   end
 
   def parsed_uri

diff --git a/app/controllers/well_known/host_meta_controller.rb b/app/controllers/well_known/host_meta_controller.rb
index 2f0960acdb4d612dfabbda27d93e051f596b92b0..82bfd3575a4cd952082a9ef469f180cee89f8913 100644 (file)
--- a/app/controllers/well_known/host_meta_controller.rb
+++ b/app/controllers/well_known/host_meta_controller.rb
@@ -1,4 +1,4 @@
-  # frozen_string_literal: true
+# frozen_string_literal: true
 
 module WellKnown
   class HostMetaController < ApplicationController

diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 5080e6350525da9bdf83b12e3ce92b530226f414..1e4a3f0d0fca0df77171034ab01b34faaafe0838 100644 (file)
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Admin::FilterHelper
-  ACCOUNT_FILTERS = %i[local remote by_domain silenced suspended recent].freeze
-  REPORT_FILTERS = %i[resolved account_id target_account_id].freeze
+  ACCOUNT_FILTERS = %i(local remote by_domain silenced suspended recent).freeze
+  REPORT_FILTERS = %i(resolved account_id target_account_id).freeze
 
   FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS
 

diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index e695d22ca91aa03a76101893f8721cf33fae9b02..04b2ed958c3c43b5f98867057d383375fbaf5412 100644 (file)
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -63,10 +63,12 @@ class AccountSearchService < BaseService
   end
 
   def search_results
-    @_search_results ||= if account
-      advanced_search_results
-    else
-      simple_search_results
+    @_search_results ||= begin
+      if account
+        advanced_search_results
+      else
+        simple_search_results
+      end
     end
   end
 

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 799a9f6e3966f644b0f7163280f1637feecde963..7a27b7b2988b19763e9be6a347ebf08d9dbe0000 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -205,7 +205,7 @@ class ProcessFeedService < BaseService
         media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
         parsed_url = Addressable::URI.parse(link['href']).normalize
 
-        next if !%w[http https].include?(parsed_url.scheme) || parsed_url.host.empty?
+        next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
 
         media.save
 

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 985747936ac3c5a2cb80f85dbe75cfb7e83beb84..2ddf3c2f0a21a85ed2e5ded213ecffa46f9722d5 100644 (file)
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -61,7 +61,6 @@ namespace :mastodon do
     desc 'Set unknown attachment type for remote-only attachments'
     task set_unknown: :environment do
       Rails.logger.debug 'Setting unknown attachment type for remote-only attachments...'
-      # rubocop:disable Rails/SkipsModelValidations
       MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown)
       Rails.logger.debug 'Done!'
     end