Precompile configured assets

2 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 81127e5e5f..9e87714e4f 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,7 +10,7 @@ module Rails
                     :preload_frameworks, :reload_plugins,
                     :secret_token, :serve_static_assets, :session_options,
                     :time_zone, :whiny_nils,
-                    :asset_pipeline, :compile_assets
+                    :asset_pipeline, :precompile_assets
 
       attr_writer :log_level
 
@@ -30,7 +30,7 @@ module Rails
         @middleware                  = app_middleware
         @generators                  = app_generators
         @asset_pipeline              = false
-        @compile_assets              = []
+        @precompile_assets           = []
       end
 
       def compiled_asset_path
diff --git a/railties/lib/rails/tasks/assets.rake b/railties/lib/rails/tasks/assets.rake
index 63e49ad2de..8c85180b34 100644
--- a/railties/lib/rails/tasks/assets.rake
+++ b/railties/lib/rails/tasks/assets.rake
@@ -1,6 +1,6 @@
 namespace :assets do
   task :compile => :environment do
-    assets = ENV['assets'].split(',')
+    assets = Rails.application.config.precompile_assets
     Rails.application.assets.precompile(*assets)
   end
 end