aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/Rakefile2
-rw-r--r--railties/environments/shared.rb2
-rw-r--r--railties/environments/shared_for_gem.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index f64f15b149..9bfe811b8e 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -246,7 +246,7 @@ spec = Gem::Specification.new do |s|
s.add_dependency('activerecord', '>= 1.6.0')
s.add_dependency('actionpack', '>= 1.4.0')
s.add_dependency('actionmailer', '>= 0.6.1')
- s.add_dependency('actionservice', '>= 0.4.0')
+ s.add_dependency('actionwebservice', '>= 0.4.0')
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false
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'