aboutsummaryrefslogtreecommitdiffstats
path: root/config/application.rb
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2014-03-13 22:34:36 +0900
committerRhenium <rhenium@rhe.jp>2014-03-13 22:34:36 +0900
commitff11dfd29dcf731030f7e640d1a73642d62baab7 (patch)
tree3d28e3524893d4e016be3d6525f32b54855c168c /config/application.rb
parentc50b8b97993bd6e168afb34f25dac23c3f85ae6b (diff)
downloadaclog-ff11dfd29dcf731030f7e640d1a73642d62baab7.tar.gz
upgrade Rails to 4.1.0.rc1, add Guard, Spring
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb5
1 files changed, 3 insertions, 2 deletions
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