comparison config/application.rb @ 438:a5eae5b07abf

Prepare for removing custom database.yml
author nanaya <me@myconan.net>
date Sat, 02 Jul 2016 17:18:07 +0900
parents d31fe32da7a0
children 07d6c6639adf
comparison
equal deleted inserted replaced
437:d31fe32da7a0 438:a5eae5b07abf
1 require_relative "boot" 1 require_relative "boot"
2 2
3 # To allow setting environment variable ZP_DATABASE_URL instead of DATABASE_URL. 3 # To allow setting environment variable ZP_DATABASE_URL instead of DATABASE_URL.
4 ENV["DATABASE_URL"] = ENV["ZP_DATABASE_URL"] if ENV["ZP_DATABASE_URL"] 4 ENV["DATABASE_URL"] = ENV["ZP_DATABASE_URL"] if ENV["ZP_DATABASE_URL"]
5
6 require_relative "config_init"
5 7
6 require "active_record/railtie" 8 require "active_record/railtie"
7 require "action_controller/railtie" 9 require "action_controller/railtie"
8 # require "action_mailer/railtie" 10 # require "action_mailer/railtie"
9 require "sprockets/railtie" 11 require "sprockets/railtie"
10 require "rails/test_unit/railtie" 12 require "rails/test_unit/railtie"
11
12 require_relative "config_init"
13 13
14 # If you precompile assets before deploying to production, use this line 14 # If you precompile assets before deploying to production, use this line
15 Bundler.require(*$cfg[:bundler_groups]) 15 Bundler.require(*$cfg[:bundler_groups])
16 # If you want your assets lazily compiled in production, use this line 16 # If you want your assets lazily compiled in production, use this line
17 # Bundler.require(:default, :assets, Rails.env) 17 # Bundler.require(:default, :assets, Rails.env)