aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-09-30 01:22:52 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2012-09-30 01:22:52 -0700
commitda27fa18cd3797e13aa550b2e367e6d05b7aa27d (patch)
tree98d80d8678abea7d8cf55e54910f6b7ddc5d6795 /actionpack
parent15712ac4c98a34f5f465ffcb2374737d94bb9081 (diff)
parent59b8b82e4fba1c11161a4897e758306bab4d02cd (diff)
downloadrails-da27fa18cd3797e13aa550b2e367e6d05b7aa27d.tar.gz
rails-da27fa18cd3797e13aa550b2e367e6d05b7aa27d.tar.bz2
rails-da27fa18cd3797e13aa550b2e367e6d05b7aa27d.zip
Merge pull request #7795 from guilleiguaran/fix-ap-changelog
Fix changelog entry about sprockets-rails
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4306447272..490eb17df3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -63,9 +63,8 @@
*Luiz Felipe Garcia Pereira*
-* Sprockets integration has been extracted from Action Pack and the `sprockets-rails`
- gem should be added to Gemfile (under the assets group) in order to use Rails asset
- pipeline in future versions of Rails.
+* Sprockets integration has been extracted from Action Pack to the `sprockets-rails`
+ gem. `rails` gem is depending on `sprockets-rails` by default.
*Guillermo Iguaran*