diff options
Diffstat (limited to 'actionwebservice')
| -rw-r--r-- | actionwebservice/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionwebservice/lib/action_web_service/api.rb | 2 | ||||
| -rw-r--r-- | actionwebservice/lib/action_web_service/base.rb | 2 | ||||
| -rw-r--r-- | actionwebservice/lib/action_web_service/struct.rb | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index ee3e8b3746..a389382c75 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] + * Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev] * Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.] diff --git a/actionwebservice/lib/action_web_service/api.rb b/actionwebservice/lib/action_web_service/api.rb index 7193bd8a51..73fb886e6d 100644 --- a/actionwebservice/lib/action_web_service/api.rb +++ b/actionwebservice/lib/action_web_service/api.rb @@ -16,7 +16,7 @@ module ActionWebService # :nodoc: class Base # Action WebService API subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::Subclasses + include Reloadable::Deprecated # Whether to transform the public API method names into camel-cased names class_inheritable_option :inflect_names, true diff --git a/actionwebservice/lib/action_web_service/base.rb b/actionwebservice/lib/action_web_service/base.rb index 5675a5bd2b..43c7b6fa26 100644 --- a/actionwebservice/lib/action_web_service/base.rb +++ b/actionwebservice/lib/action_web_service/base.rb @@ -33,7 +33,7 @@ module ActionWebService # :nodoc: class Base # Action WebService subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::Subclasses + include Reloadable::Deprecated # Whether to report exceptions back to the caller in the protocol's exception # format diff --git a/actionwebservice/lib/action_web_service/struct.rb b/actionwebservice/lib/action_web_service/struct.rb index d065dae03b..af93f65a4e 100644 --- a/actionwebservice/lib/action_web_service/struct.rb +++ b/actionwebservice/lib/action_web_service/struct.rb @@ -21,7 +21,7 @@ module ActionWebService class Struct # Action WebService Struct subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::Subclasses + include Reloadable::Deprecated # If a Hash is given as argument to an ActionWebService::Struct constructor, # it can contain initial values for the structure member. |