diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-06-13 19:22:57 -0700 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-06-13 19:22:57 -0700 |
commit | 90a6059dd2df748e002618eaacab6b46f50d4bfc (patch) | |
tree | 67fcae8d34608adeabd4389489ad239fbb026af6 /railties/lib/rails | |
parent | 383842d079e74de49dbe81ea4c2db61f79c665d9 (diff) | |
parent | 2d5a6de4e227ee97ccbea691c69728b7e31bf678 (diff) | |
download | rails-90a6059dd2df748e002618eaacab6b46f50d4bfc.tar.gz rails-90a6059dd2df748e002618eaacab6b46f50d4bfc.tar.bz2 rails-90a6059dd2df748e002618eaacab6b46f50d4bfc.zip |
Merge pull request #10833 from hone/remove_initialize_on_precompile
`initialize_on_precompile` is not used anymore.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/application.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 914e4393c4..753e870a8c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -207,9 +207,7 @@ module Rails end # Initialize the application passing the given group. By default, the - # group is :default but sprockets precompilation passes group equals - # to assets if initialize_on_precompile is false to avoid booting the - # whole app. + # group is :default def initialize!(group=:default) #:nodoc: raise "Application has been already initialized." if @initialized run_initializers(group, self) diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 31fc80e544..644893d9e1 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -61,7 +61,6 @@ module Rails @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/#{Rails.env}/" ] @assets.js_compressor = nil @assets.css_compressor = nil - @assets.initialize_on_precompile = true @assets.logger = nil end |