From 0a0b9a271a8de84272ff2dafc96ef53db224bb21 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 8 Jun 2017 20:24:28 +0900 Subject: Improve RuboCop rules (compatibility to Code Climate) (#3636) https://github.com/codeclimate/codeclimate-rubocop/blob/08f8de84ebfb39caa96391e23816877278f6441c/Gemfile.lock#L38 Code Climate is using RuboCop v0.46.0. Change several rules to maintain compatibility. --- app/services/fetch_atom_service.rb | 2 +- app/services/suspend_account_service.rb | 2 +- app/services/update_remote_profile_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/services') diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb index 9c514aa9f..8f42db0aa 100644 --- a/app/services/fetch_atom_service.rb +++ b/app/services/fetch_atom_service.rb @@ -16,7 +16,7 @@ class FetchAtomService < BaseService return nil if response.code != 200 return [url, fetch(url)] if response.mime_type == 'application/atom+xml' - return process_headers(url, response) unless response['Link'].blank? + return process_headers(url, response) if response['Link'].present? process_html(fetch(url)) rescue OpenSSL::SSL::SSLError => e Rails.logger.debug "SSL error: #{e}" diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 0cf574ca2..4a4f23b80 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -23,7 +23,7 @@ class SuspendAccountService < BaseService @account.notifications, @account.favourites, @account.active_relationships, - @account.passive_relationships + @account.passive_relationships, ].each do |association| destroy_all(association) end diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb index 6607bc84e..8a553bb36 100644 --- a/app/services/update_remote_profile_service.rb +++ b/app/services/update_remote_profile_service.rb @@ -24,7 +24,7 @@ class UpdateRemoteProfileService < BaseService end old_hub_url = account.hub_url - account.hub_url = hub_link['href'] if !hub_link.nil? && !hub_link['href'].blank? && (hub_link['href'] != old_hub_url) + account.hub_url = hub_link['href'] if !hub_link.nil? && hub_link['href'].present? && (hub_link['href'] != old_hub_url) account.save_with_optional_media! -- cgit