From ff11dfd29dcf731030f7e640d1a73642d62baab7 Mon Sep 17 00:00:00 2001 From: Rhenium Date: Thu, 13 Mar 2014 22:34:36 +0900 Subject: upgrade Rails to 4.1.0.rc1, add Guard, Spring --- config/application.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index d761e3d..0139ebe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,15 +1,17 @@ require File.expand_path('../boot', __FILE__) # Pick the frameworks you want: +require "active_model/railtie" require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" +require "action_view/railtie" require "sprockets/railtie" # require "rails/test_unit/railtie" # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) +Bundler.require(*Rails.groups) module Aclog class Application < Rails::Application @@ -30,7 +32,6 @@ module Aclog # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - I18n.enforce_available_locales = true config.i18n.default_locale = :ja config.i18n.fallbacks = true -- cgit v1.2.3