Disable sprockets to avoid Sprockets::Railtie::ManifestNeededError raised by sprocket...

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@18859 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 7e2a627ef4f993f5ddcbc31f82a59f515ffdbe1c..d964de977c815fb199fb6e612a0684d70a7b6f5a 100644 (file)
--- 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 1fb40aeb65d7c700eb4c6285fd2b2401a5d38eec..a06ee4dbab6eabfb22e1bc89b936c6f5f438eba2 100644 (file)
--- 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