diff options
| author | yhirano <yhirano@me.com> | 2017-04-30 07:23:45 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-30 00:23:45 +0200 |
| commit | 8325866c6101c7b63b616e7e0035080ef1af96a7 (patch) | |
| tree | c469fbd1529052675602caac06653db3ab205e9c /app/services | |
| parent | 01e011bc902709db6ec92bcea0136ae9fd258c34 (diff) | |
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
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/account_search_service.rb | 10 | ||||
| -rw-r--r-- | app/services/process_feed_service.rb | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index e695d22ca..04b2ed958 100644 --- 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 799a9f6e3..7a27b7b29 100644 --- 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 |