Apply Rubocop Style/NegatedIfElseCondition (#23451)
This commit is contained in:
parent
8c1b65c7dd
commit
f68bb52556
5 changed files with 12 additions and 12 deletions
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
class Api::V1::StreamingController < Api::BaseController
|
class Api::V1::StreamingController < Api::BaseController
|
||||||
def index
|
def index
|
||||||
if Rails.configuration.x.streaming_api_base_url != request.host
|
if Rails.configuration.x.streaming_api_base_url == request.host
|
||||||
redirect_to streaming_api_url, status: 301
|
|
||||||
else
|
|
||||||
not_found
|
not_found
|
||||||
|
else
|
||||||
|
redirect_to streaming_api_url, status: 301
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -265,7 +265,7 @@ class User < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def inactive_message
|
def inactive_message
|
||||||
!approved? ? :pending : super
|
approved? ? super : :pending
|
||||||
end
|
end
|
||||||
|
|
||||||
def approve!
|
def approve!
|
||||||
|
|
|
@ -82,7 +82,7 @@ class FetchOEmbedService
|
||||||
return if @endpoint_url.blank?
|
return if @endpoint_url.blank?
|
||||||
|
|
||||||
body = Request.new(:get, @endpoint_url).perform do |res|
|
body = Request.new(:get, @endpoint_url).perform do |res|
|
||||||
res.code != 200 ? nil : res.body_with_limit
|
res.code == 200 ? res.body_with_limit : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
validate(parse_for_format(body)) if body.present?
|
validate(parse_for_format(body)) if body.present?
|
||||||
|
|
|
@ -19,7 +19,7 @@ class VerifyLinkService < BaseService
|
||||||
|
|
||||||
def perform_request!
|
def perform_request!
|
||||||
@body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
|
@body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
|
||||||
res.code != 200 ? nil : res.body_with_limit
|
res.code == 200 ? res.body_with_limit : nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -463,10 +463,10 @@ namespace :mastodon do
|
||||||
prompt.say 'Running `RAILS_ENV=production rails db:setup` ...'
|
prompt.say 'Running `RAILS_ENV=production rails db:setup` ...'
|
||||||
prompt.say "\n\n"
|
prompt.say "\n\n"
|
||||||
|
|
||||||
if !system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production', 'SAFETY_ASSURED' => '1' }), 'rails db:setup')
|
if system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production', 'SAFETY_ASSURED' => '1' }), 'rails db:setup')
|
||||||
prompt.error 'That failed! Perhaps your configuration is not right'
|
|
||||||
else
|
|
||||||
prompt.ok 'Done!'
|
prompt.ok 'Done!'
|
||||||
|
else
|
||||||
|
prompt.error 'That failed! Perhaps your configuration is not right'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -479,10 +479,10 @@ namespace :mastodon do
|
||||||
prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...'
|
prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...'
|
||||||
prompt.say "\n\n"
|
prompt.say "\n\n"
|
||||||
|
|
||||||
if !system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production' }), 'rails assets:precompile')
|
if system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production' }), 'rails assets:precompile')
|
||||||
prompt.error 'That failed! Maybe you need swap space?'
|
|
||||||
else
|
|
||||||
prompt.say 'Done!'
|
prompt.say 'Done!'
|
||||||
|
else
|
||||||
|
prompt.error 'That failed! Maybe you need swap space?'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue