aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-18 23:43:09 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-18 23:43:09 +0000
commit7a67d0f617db7d2962b6c3b80466e21570b244bf (patch)
tree56fa640e31f4f7f22d34a246bc1b197706a07e3a /railties/environments
parentfdecb6843ba8c5b0f718225f343017e11fa7f711 (diff)
downloadrails-7a67d0f617db7d2962b6c3b80466e21570b244bf.tar.gz
rails-7a67d0f617db7d2962b6c3b80466e21570b244bf.tar.bz2
rails-7a67d0f617db7d2962b6c3b80466e21570b244bf.zip
Renamed Action Service to Action Web Service
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/shared.rb2
-rw-r--r--railties/environments/shared_for_gem.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 3638f6f1fc..b5340bd7c9 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -24,7 +24,7 @@ ADDITIONAL_LOAD_PATHS.concat %w(
vendor/activerecord/lib
vendor/actionpack/lib
vendor/actionmailer/lib
- vendor/actionservice/lib
+ vendor/actionwebservice/lib
).map { |dir| "#{RAILS_ROOT}/#{dir}" }
# Prepend to $LOAD_PATH
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index dd2c7c2d29..dc424aa6b3 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -30,7 +30,7 @@ require_gem 'activesupport'
require_gem 'activerecord'
require_gem 'actionpack'
require_gem 'actionmailer'
-require_gem 'actionservice'
+require_gem 'actionwebservice'
require_gem 'rails'