Merge branch 'master' of https://github.com/rails/rails into performance_test

2 files changed, 6 insertions, 29 deletions

diff --git a/railties/lib/rails/tasks/assets.rake b/railties/lib/rails/tasks/assets.rake
new file mode 100644
index 0000000000..396ce728a1
--- /dev/null
+++ b/railties/lib/rails/tasks/assets.rake
@@ -0,0 +1,6 @@
+namespace :assets do
+  task :compile => :environment do
+    assets = Rails.application.config.assets.precompile
+    Rails.application.assets.precompile(*assets)
+  end
+end
diff --git a/railties/lib/rails/tasks/railties.rake b/railties/lib/rails/tasks/railties.rake
deleted file mode 100644
index 16703879cf..0000000000
--- a/railties/lib/rails/tasks/railties.rake
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace :railties do
-  namespace :install do
-    # desc "Copies missing assets from Railties (e.g. plugins, engines). You can specify Railties to use with FROM=railtie1,railtie2"
-    task :assets => :rails_env do
-      require 'rails/generators/base'
-      Rails.application.initialize!
-
-      to_load = ENV["FROM"].blank? ? :all : ENV["FROM"].split(",").map {|n| n.strip }
-      app_public_path = Rails.application.paths["public"].first
-
-      Rails.application.railties.all do |railtie|
-        next unless to_load == :all || to_load.include?(railtie.railtie_name)
-
-        if railtie.respond_to?(:paths) && (path = railtie.paths["public"].first) &&
-           (assets_dir = railtie.config.compiled_asset_path) && File.exist?(path)
-
-          Rails::Generators::Base.source_root(path)
-          copier = Rails::Generators::Base.new
-          Dir[File.join(path, "**/*")].each do |file|
-            relative = file.gsub(/^#{path}\//, '')
-            if File.file?(file)
-              copier.copy_file relative, File.join(app_public_path, assets_dir, relative)
-            end
-          end
-        end
-      end
-    end
-  end
-end