* VRFS-259: changing order of some things to allow server startup

This commit is contained in:
Seth Call 2013-03-14 23:47:39 -05:00
parent b43e2fa61c
commit 020719e6fe
1 changed files with 7 additions and 3 deletions

View File

@ -6,10 +6,11 @@ require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
require "sprockets/railtie"
require "jam_ruby"
include JamRuby
# require "rails/test_unit/railtie"
# initialize ActiveRecord's db connection
# why? Because user.rb uses validates :acceptance, which needs a connection to the database. if there is better way...
ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))[Rails.env])
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
@ -18,6 +19,9 @@ if defined?(Bundler)
# Bundler.require(:default, :assets, Rails.env)
end
include JamRuby
# require "rails/test_unit/railtie"
module SampleApp
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.