updated to rails 3.2, fixed tests

This commit is contained in:
albert
2012-01-27 14:22:47 -05:00
parent 75d977ae80
commit c8bcf5ad7c
16 changed files with 146 additions and 105 deletions

View File

@@ -2,10 +2,9 @@ require File.expand_path('../boot', __FILE__)
require 'rails/all'
# If you have a Gemfile, require the default gems, the ones in the
# current environment and also include :assets gems if in development
# or test environments.
Bundler.require *Rails.groups(:assets) if defined?(Bundler)
if defined?(Bundler)
Bundler.require(*Rails.groups(:assets => %w(development test)))
end
module Danbooru
class Application < Rails::Application
@@ -13,6 +12,7 @@ module Danbooru
config.encoding = "utf-8"
config.filter_parameters += [:password]
config.assets.enabled = true
config.assets.version = '1.0'
config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers)
config.plugins = [:all]
config.time_zone = 'Eastern Time (US & Canada)'