mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Merge pull request #2665 from akshaymohite/optimization-fixes
updated checks of environment with Rails.env by Rails.env methods
This commit is contained in:
commit
625c3e2961
@ -1,12 +1,12 @@
|
||||
module CommonHelper
|
||||
def render_google_universal_analytics_code
|
||||
if Rails.env == "production" && SiteSetting.ga_universal_tracking_code.present?
|
||||
if Rails.env.production? && SiteSetting.ga_universal_tracking_code.present?
|
||||
render partial: "common/google_universal_analytics"
|
||||
end
|
||||
end
|
||||
|
||||
def render_google_analytics_code
|
||||
if Rails.env == "production" && SiteSetting.ga_tracking_code.present?
|
||||
if Rails.env.production? && SiteSetting.ga_tracking_code.present?
|
||||
render partial: "common/google_analytics"
|
||||
end
|
||||
end
|
||||
|
@ -23,7 +23,7 @@ module Jobs
|
||||
Email::Sender.new(message, :new_version).send
|
||||
end
|
||||
rescue => e
|
||||
raise e unless Rails.env == 'development' # Fail version check silently in development mode
|
||||
raise e unless Rails.env.development? # Fail version check silently in development mode
|
||||
end
|
||||
end
|
||||
true
|
||||
|
@ -84,7 +84,7 @@ class AdminDashboardData
|
||||
end
|
||||
|
||||
def rails_env_check
|
||||
I18n.t("dashboard.rails_env_warning", env: Rails.env) unless Rails.env == 'production'
|
||||
I18n.t("dashboard.rails_env_warning", env: Rails.env) unless Rails.env.production?
|
||||
end
|
||||
|
||||
def host_names_check
|
||||
@ -170,7 +170,7 @@ class AdminDashboardData
|
||||
end
|
||||
|
||||
def send_consumer_email_check
|
||||
I18n.t('dashboard.consumer_email_warning') if Rails.env == 'production' and ActionMailer::Base.smtp_settings[:address] =~ /gmail\.com|live\.com|yahoo\.com/
|
||||
I18n.t('dashboard.consumer_email_warning') if Rails.env.production? and ActionMailer::Base.smtp_settings[:address] =~ /gmail\.com|live\.com|yahoo\.com/
|
||||
end
|
||||
|
||||
def site_contact_username_check
|
||||
|
@ -9,7 +9,7 @@ require_relative '../lib/discourse_plugin_registry'
|
||||
# Global config
|
||||
require_relative '../app/models/global_setting'
|
||||
|
||||
require 'pry-rails' if Rails.env == "development"
|
||||
require 'pry-rails' if Rails.env.development?
|
||||
|
||||
if defined?(Bundler)
|
||||
Bundler.require(*Rails.groups(assets: %w(development test profile)))
|
||||
@ -18,7 +18,7 @@ end
|
||||
module Discourse
|
||||
class Application < Rails::Application
|
||||
def config.database_configuration
|
||||
if Rails.env == "production"
|
||||
if Rails.env.production?
|
||||
GlobalSetting.database_config
|
||||
else
|
||||
super
|
||||
|
@ -14,7 +14,7 @@ Discourse::Application.routes.draw do
|
||||
match "/404", to: "exceptions#not_found", via: [:get, :post]
|
||||
get "/404-body" => "exceptions#not_found_body"
|
||||
|
||||
if Rails.env == "development"
|
||||
if Rails.env.development?
|
||||
mount Sidekiq::Web => "/sidekiq"
|
||||
mount Logster::Web => "/logs"
|
||||
else
|
||||
|
@ -42,7 +42,7 @@ module DiscourseHub
|
||||
end
|
||||
|
||||
def self.hub_base_url
|
||||
if Rails.env == 'production'
|
||||
if Rails.env.production?
|
||||
'http://api.discourse.org/api'
|
||||
else
|
||||
ENV['HUB_BASE_URL'] || 'http://local.hub:3000/api'
|
||||
|
@ -58,7 +58,7 @@ module Import
|
||||
rescue SystemExit
|
||||
log "Restore process was cancelled!"
|
||||
rollback
|
||||
rescue Exception => ex
|
||||
rescue => ex
|
||||
log "EXCEPTION: " + ex.message
|
||||
log ex.backtrace.join("\n")
|
||||
rollback
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Scheduler
|
||||
module Deferrable
|
||||
def initialize
|
||||
@async = Rails.env != "test"
|
||||
@async = !Rails.env.test?
|
||||
@queue = Queue.new
|
||||
@mutex = Mutex.new
|
||||
@thread = nil
|
||||
|
@ -6,17 +6,17 @@ describe AdminDashboardData do
|
||||
subject { described_class.new.rails_env_check }
|
||||
|
||||
it 'returns nil when running in production mode' do
|
||||
Rails.stubs(:env).returns('production')
|
||||
Rails.stubs(env: ActiveSupport::StringInquirer.new('production'))
|
||||
subject.should be_nil
|
||||
end
|
||||
|
||||
it 'returns a string when running in development mode' do
|
||||
Rails.stubs(:env).returns('development')
|
||||
Rails.stubs(env: ActiveSupport::StringInquirer.new('development'))
|
||||
subject.should_not be_nil
|
||||
end
|
||||
|
||||
it 'returns a string when running in test mode' do
|
||||
Rails.stubs(:env).returns('test')
|
||||
Rails.stubs(env: ActiveSupport::StringInquirer.new('test'))
|
||||
subject.should_not be_nil
|
||||
end
|
||||
end
|
||||
@ -119,12 +119,12 @@ describe AdminDashboardData do
|
||||
before { ActionMailer::Base.stubs(:smtp_settings).returns({address: 'smtp.gmail.com'}) }
|
||||
|
||||
it 'returns nil in development env' do
|
||||
Rails.stubs(:env).returns('development')
|
||||
Rails.stubs(env: ActiveSupport::StringInquirer.new('development'))
|
||||
expect(subject).to be_nil
|
||||
end
|
||||
|
||||
it 'returns a string when in production env' do
|
||||
Rails.stubs(:env).returns('production')
|
||||
Rails.stubs(env: ActiveSupport::StringInquirer.new('production'))
|
||||
expect(subject).to_not be_nil
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user