Permalink
Browse files

included another upgrading pinfall - accidentally having duplicate js…

… files
  • Loading branch information...
1 parent c1474ff commit 3c65c4ce3fcc99d9d172a522f5d82f8bc04fca5c @caseywatts caseywatts committed Jun 15, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 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>
+
+

0 comments on commit 3c65c4c

Please sign in to comment.