diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-10-23 13:24:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 13:24:18 -0400 |
| commit | 8c7aa4c7bcb4ae42db8c573ba64a5eabdf54ecd1 (patch) | |
| tree | c05dc7ca3e0792b4d490efc32b6dfa5c17b84287 /actionpack/lib | |
| parent | 280fb08fc78f7809eba69d1f3bcc8fc9411d34c9 (diff) | |
| parent | fea8d3509d65396f7c04a5e2608ef8863e1abe75 (diff) | |
| download | rails-8c7aa4c7bcb4ae42db8c573ba64a5eabdf54ecd1.tar.gz rails-8c7aa4c7bcb4ae42db8c573ba64a5eabdf54ecd1.tar.bz2 rails-8c7aa4c7bcb4ae42db8c573ba64a5eabdf54ecd1.zip | |
Merge pull request #30945 from rafaelfranca/remove-deprecations
Remove deprecations
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index ae875eb830..8d7431fd6b 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -123,9 +123,4 @@ module ActionDispatch end end end - - module ParamsParser - include ActiveSupport::Deprecation::DeprecatedConstantAccessor - deprecate_constant "ParseError", "ActionDispatch::Http::Parameters::ParseError" - end end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 18862d819f..71cb458112 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -584,14 +584,14 @@ module ActionDispatch if route.segment_keys.include?(:controller) ActiveSupport::Deprecation.warn(<<-MSG.squish) Using a dynamic :controller segment in a route is deprecated and - will be removed in Rails 5.2. + will be removed in Rails 6.0. MSG end if route.segment_keys.include?(:action) ActiveSupport::Deprecation.warn(<<-MSG.squish) Using a dynamic :action segment in a route is deprecated and - will be removed in Rails 5.2. + will be removed in Rails 6.0. MSG end |