diff --git a/Gemfile b/Gemfile index 762c6cefb..8eacdd122 100644 --- a/Gemfile +++ b/Gemfile @@ -15,9 +15,6 @@ gem "nokogiri", "~> 1.10.0" gem "i18n", "~> 1.6.0" gem "rbpdf", "~> 1.20.0" -# TODO: Remove the following line when #32223 is fixed -gem "sprockets", "~> 3.7.2" - # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] diff --git a/config/application.rb b/config/application.rb index 1fb40aeb6..17bc48ec1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -2,7 +2,18 @@ require File.expand_path('../boot', __FILE__) -require 'rails/all' +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" Bundler.require(*Rails.groups) @@ -40,12 +51,6 @@ module RedmineApp # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] - # Enable the asset pipeline - config.assets.enabled = false - - # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' - config.action_mailer.perform_deliveries = false # Do not include all helpers