This reverts 1b622667bc
We have had reports of issues rebuilding under memory-constrained environments. Reverting while we investigate further.
This commit is contained in:
parent
15cff27bfe
commit
e92f57255d
|
@ -23,7 +23,7 @@ class QunitController < ApplicationController
|
|||
|
||||
@is_proxied = is_ember_cli_proxy?
|
||||
@legacy_ember = if Rails.env.production?
|
||||
ENV['EMBER_CLI_PROD_ASSETS'] == "0"
|
||||
ENV['EMBER_CLI_PROD_ASSETS'] != "1"
|
||||
else
|
||||
!@is_proxied
|
||||
end
|
||||
|
|
|
@ -138,7 +138,7 @@ module ApplicationHelper
|
|||
def preload_vendor_scripts
|
||||
scripts = ["vendor"]
|
||||
|
||||
if ENV["EMBER_CLI_PROD_ASSETS"] != "0"
|
||||
if ENV["EMBER_CLI_PROD_ASSETS"] == "1"
|
||||
@@vendor_chunks ||= begin
|
||||
all_assets = ActionController::Base.helpers.assets_manifest.assets
|
||||
all_assets.keys.filter_map { |name| name[/\A(chunk\..*)\.js\z/, 1] }
|
||||
|
|
|
@ -180,7 +180,7 @@ module Discourse
|
|||
discourse/tests/test_starter.js
|
||||
}
|
||||
|
||||
if ENV['EMBER_CLI_PROD_ASSETS'] == "0"
|
||||
if ENV['EMBER_CLI_PROD_ASSETS'] != "1"
|
||||
config.assets.precompile += %w{
|
||||
discourse/tests/test-support-rails.js
|
||||
discourse/tests/test-helpers-rails.js
|
||||
|
|
|
@ -35,7 +35,7 @@ task 'assets:precompile:before' do
|
|||
require 'sprockets'
|
||||
require 'digest/sha1'
|
||||
|
||||
if ENV['EMBER_CLI_PROD_ASSETS'] != "0"
|
||||
if ENV['EMBER_CLI_PROD_ASSETS'] == "1"
|
||||
# Remove the assets that Ember CLI will handle for us
|
||||
Rails.configuration.assets.precompile.reject! do |asset|
|
||||
asset.is_a?(String) &&
|
||||
|
@ -312,7 +312,7 @@ end
|
|||
|
||||
task 'assets:precompile' => 'assets:precompile:before' do
|
||||
|
||||
copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] != '0'
|
||||
copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] == '1'
|
||||
|
||||
refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days
|
||||
|
||||
|
|
Loading…
Reference in New Issue