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
This commit is contained in:
yhirano
2017-04-30 07:23:45 +09:00
committed by Eugen Rochko
parent 01e011bc90
commit 8325866c61
10 changed files with 17 additions and 14 deletions

View File

@ -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

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
# frozen_string_literal: true
module WellKnown
class HostMetaController < ApplicationController

View File

@ -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

View File

@ -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

View File

@ -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