diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/shared.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f29585446a..ac15f159ec 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed textilize for RedCloth3 to keep doing hardbreaks + * Fixed that assert_template_xpath_matches did not indicate when a path was not found #658 [Eric Hodel] * Added TextHelper#auto_link, TextHelper#auto_link_urls, and TextHelper#auto_link_email_addresses to turn those elements into ahrefs diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index b5340bd7c9..120ac08b2b 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -36,7 +36,7 @@ require 'active_support' require 'active_record' require 'action_controller' require 'action_mailer' -require 'action_service' +require 'action_web_service' # Environment-specific configuration. |