aboutsummaryrefslogtreecommitdiffstats
path: root/config/application.rb
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2014-09-15 08:20:50 +0900
committerrhenium <rhenium@rhe.jp>2014-09-15 08:20:50 +0900
commite34c7758ef1d98b7747fc2b0c543b65201c3cdd1 (patch)
tree67ae6c8bfd0ee335513277302876fc0a1a2b63dc /config/application.rb
parentf6eb29604f6d3728834fe427e14c37c9c4526004 (diff)
downloadaclog-e34c7758ef1d98b7747fc2b0c543b65201c3cdd1.tar.gz
Ruby on Rails 4.2.0.beta1
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb
index 0139ebe..441de70 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,13 +1,13 @@
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 "action_mailer/railtie"
+# require "active_job/railtie"
# require "rails/test_unit/railtie"
+require "sprockets/railtie"
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
@@ -35,9 +35,6 @@ module Aclog
config.i18n.default_locale = :ja
config.i18n.fallbacks = true
- config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.eot *.woff *.ttf *.svg)
- config.assets.precompile += [Proc.new { |path, fn| fn =~ /app\/assets/ && %w(.js).include?(File.extname(path)) }]
-
config.generators do |g|
g.test_framework :rspec
g.fixture_replacement :factory_girl