diff --git a/config/application.rb b/config/application.rb index 7a1926815..0518741e2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,5 +1,16 @@ require_relative 'boot' -require 'rails/all' +require "rails" +require "active_record/railtie" +#require "active_storage/engine" +require "action_controller/railtie" +require "action_view/railtie" +require "action_mailer/railtie" +require "active_job/railtie" +#require "action_cable/engine" +#require "action_mailbox/engine" +#require "action_text/engine" +require "rails/test_unit/railtie" +#require "sprockets/railtie" Bundler.require(*Rails.groups) @@ -16,8 +27,8 @@ module Danbooru config.active_record.schema_format = :sql config.encoding = "utf-8" config.filter_parameters += [:password] - config.assets.enabled = true - config.assets.version = '1.0' + #config.assets.enabled = true + #config.assets.version = '1.0' config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers) config.plugins = [:all] config.time_zone = 'Eastern Time (US & Canada)' diff --git a/config/environments/development.rb b/config/environments/development.rb index 66df51f6f..9b5b48df6 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -29,7 +29,7 @@ Rails.application.configure do end # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + # config.active_storage.service = :local # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false @@ -48,10 +48,10 @@ Rails.application.configure do # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. - config.assets.debug = true + # config.assets.debug = true # Suppress logger output for asset requests. - config.assets.quiet = true + # config.assets.quiet = true # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true diff --git a/config/environments/production.rb b/config/environments/production.rb index 1cf9dae7d..7e8f71c86 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -26,7 +26,7 @@ Rails.application.configure do # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + # config.assets.compile = false # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.action_controller.asset_host = 'http://assets.example.com' @@ -36,7 +36,7 @@ Rails.application.configure do # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + # config.active_storage.service = :local # Mount Action Cable outside main process or domain. # config.action_cable.mount_path = nil diff --git a/config/environments/staging.rb b/config/environments/staging.rb index e7d1ccdaf..9a1b74fc5 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -29,11 +29,11 @@ Rails.application.configure do # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = true + # config.assets.compile = true # Asset digests allow you to set far-future HTTP expiration dates on all assets, # yet still be able to expire them through the digest params. - config.assets.digest = true + # config.assets.digest = true # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb diff --git a/config/environments/test.rb b/config/environments/test.rb index 4e9d6d55d..47e5f5ea6 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -31,7 +31,7 @@ Rails.application.configure do config.action_controller.allow_forgery_protection = false # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test + # config.active_storage.service = :test config.action_mailer.perform_caching = false diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb deleted file mode 100644 index ac075a7bf..000000000 --- a/config/initializers/assets.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' - -# Add additional assets to the asset load path. -# Rails.application.config.assets.paths << Emoji.images_path - -# Add Yarn node_modules folder to the asset load path. -Rails.application.config.assets.paths << Rails.root.join('node_modules') - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -Rails.application.config.assets.precompile += %w( *.png *.jpg *.gif )