From 3c65c4ce3fcc99d9d172a522f5d82f8bc04fca5c Mon Sep 17 00:00:00 2001 From: Casey Watts <casey.s.watts@gmail.com> Date: Fri, 15 Jun 2012 12:25:17 -0400 Subject: included another upgrading pinfall - accidentally having duplicate js files --- guides/source/asset_pipeline.textile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'guides/source') diff --git a/guides/source/asset_pipeline.textile b/guides/source/asset_pipeline.textile index 105efe229e..edc6735a19 100644 --- a/guides/source/asset_pipeline.textile +++ b/guides/source/asset_pipeline.textile @@ -667,9 +667,13 @@ TODO: Registering gems on "Tilt":https://github.com/rtomayko/tilt enabling Sproc h3. Upgrading from Old Versions of Rails -There are two issues when upgrading. The first is moving the files from +public/+ to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types. +There are three issues when upgrading. The first is moving the files from +public/+ to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types. -The second is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0. +The second is avoiding duplicate javascript files. If you use jquery or jquery_ujs in your manifest file, there are two changes you must make. +# You must be careful not to copy over your old javascript files which are included in the manifest file, or they will conflict. +# You must remove references to these in your layout files (since application.js will include them now). + +The third is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0. In +application.rb+: @@ -749,3 +753,5 @@ Instead of the old Rails 3.0 version: # you've limited to :test, :development, or :production. Bundler.require(:default, Rails.env) if defined?(Bundler) </ruby> + + -- cgit v1.2.3