Mercurial > zeropaste
diff config/application.rb @ 437:d31fe32da7a0
Finish updating to rails 5
author | nanaya <me@myconan.net> |
---|---|
date | Sat, 02 Jul 2016 17:04:25 +0900 |
parents | 68eb23b52864 |
children | a5eae5b07abf |
line wrap: on
line diff
--- a/config/application.rb Mon Jun 13 15:07:38 2016 +0900 +++ b/config/application.rb Sat Jul 02 17:04:25 2016 +0900 @@ -6,16 +6,13 @@ require "active_record/railtie" require "action_controller/railtie" # require "action_mailer/railtie" -# require "active_resource/railtie" require "sprockets/railtie" require "rails/test_unit/railtie" -require_relative "init_config" -suppress(LoadError) { require_relative "local_config" } -require_relative "default_config" +require_relative "config_init" # If you precompile assets before deploying to production, use this line -Bundler.require(*CONFIG["bundler_groups"]) +Bundler.require(*$cfg[:bundler_groups]) # If you want your assets lazily compiled in production, use this line # Bundler.require(:default, :assets, Rails.env)