Rails 2.1.2 deprecations (#2332).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2134 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-12-14 15:36:59 +00:00
parent 040d0a32d2
commit e2952d3e5f
5 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
require 'action_web_service'
# These need to be in the load path for action_web_service to work
Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
# AWS Test helpers
require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/
+2 -2
View File
@@ -97,8 +97,8 @@ module ActionController
"Unknown options: #{unknown_option_keys.join(', ')}" unless
unknown_option_keys.empty?
options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
options[:class_name] ||= Inflector.camelize(options[:singular_name])
options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])
end
# Returns a paginator and a collection of Active Record model instances
@@ -140,4 +140,4 @@ module Engines::RailsExtensions::Dependencies
end
end
Dependencies.send :include, Engines::RailsExtensions::Dependencies
ActiveSupport::Dependencies.send :include, Engines::RailsExtensions::Dependencies