aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-19 00:02:21 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-19 00:02:21 +0000
commitcd896fa138961339cd18b1113f16d0b09892a7d5 (patch)
treea0d325a2fa2ebda1e9f8a0d2c837509d902a6cfa
parent6b7c6e088f8a3488da7268779f51378be8266aa4 (diff)
downloadrails-cd896fa138961339cd18b1113f16d0b09892a7d5.tar.gz
rails-cd896fa138961339cd18b1113f16d0b09892a7d5.tar.bz2
rails-cd896fa138961339cd18b1113f16d0b09892a7d5.zip
Renamed action_service to action_web_service
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@674 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--railties/environments/shared.rb2
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.