Guest User

Untitled

a guest
Feb 20th, 2018
91
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.60 KB | None | 0 0
  1. diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
  2. index e9b434d..31cbe27 100644
  3. --- a/actionpack/lib/action_controller/caching/fragments.rb
  4. +++ b/actionpack/lib/action_controller/caching/fragments.rb
  5. @@ -26,32 +26,6 @@ module ActionController #:nodoc:
  6. #
  7. # expire_fragment(:controller => "topics", :action => "list", :action_suffix => "all_topics")
  8. module Fragments
  9. - def self.included(base) #:nodoc:
  10. - base.class_eval do
  11. - class << self
  12. - def fragment_cache_store=(store_option) #:nodoc:
  13. - ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=')
  14. - self.cache_store = store_option
  15. - end
  16. -
  17. - def fragment_cache_store #:nodoc:
  18. - ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store')
  19. - cache_store
  20. - end
  21. - end
  22. -
  23. - def fragment_cache_store=(store_option) #:nodoc:
  24. - ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=')
  25. - self.cache_store = store_option
  26. - end
  27. -
  28. - def fragment_cache_store #:nodoc:
  29. - ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store')
  30. - cache_store
  31. - end
  32. - end
  33. - end
  34. -
  35. # Given a key (as described in <tt>expire_fragment</tt>), returns a key suitable for use in reading,
  36. # writing, or expiring a cached fragment. If the key is a hash, the generated key is the return
  37. # value of url_for on that hash (without the protocol). All keys are prefixed with "views/" and uses
  38. diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
  39. index 8df10c4..e22978f 100644
  40. --- a/actionpack/lib/action_view/base.rb
  41. +++ b/actionpack/lib/action_view/base.rb
  42. @@ -172,18 +172,6 @@ module ActionView #:nodoc:
  43. delegate :logger, :to => 'ActionController::Base'
  44. end
  45.  
  46. - def self.cache_template_loading=(*args)
  47. - ActiveSupport::Deprecation.warn(
  48. - "config.action_view.cache_template_loading option has been deprecated" +
  49. - "and has no effect. Please remove it from your config files.", caller)
  50. - end
  51. -
  52. - def self.cache_template_extensions=(*args)
  53. - ActiveSupport::Deprecation.warn(
  54. - "config.action_view.cache_template_extensions option has been" +
  55. - "deprecated and has no effect. Please remove it from your config files.", caller)
  56. - end
  57. -
  58. # Templates that are exempt from layouts
  59. @@exempt_from_layout = Set.new([/\.rjs$/])
  60.  
  61. @@ -259,10 +247,6 @@ module ActionView #:nodoc:
  62. if options[:layout]
  63. _render_with_layout(options, local_assigns, &block)
  64. elsif options[:file]
  65. - if options[:use_full_path]
  66. - ActiveSupport::Deprecation.warn("use_full_path option has been deprecated and has no affect.", caller)
  67. - end
  68. -
  69. _pick_template(options[:file]).render_template(self, options[:locals])
  70. elsif options[:partial]
  71. render_partial(options)
  72. diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
  73. index 0ff0906..202f4ce 100644
  74. --- a/activesupport/lib/active_support.rb
  75. +++ b/activesupport/lib/active_support.rb
  76. @@ -59,7 +59,3 @@ require 'active_support/secure_random'
  77. require 'active_support/rescuable'
  78.  
  79. I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en-US.yml'
  80. -
  81. -Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
  82. -Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies')
  83. -TimeZone = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('TimeZone', 'ActiveSupport::TimeZone')
  84. diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
  85. index 18ad784..6c3bd1a 100644
  86. --- a/activesupport/test/dependencies_test.rb
  87. +++ b/activesupport/test/dependencies_test.rb
  88. @@ -279,7 +279,6 @@ class DependenciesTest < Test::Unit::TestCase
  89. assert ActiveSupport::Dependencies.qualified_const_defined?("Object")
  90. assert ActiveSupport::Dependencies.qualified_const_defined?("::Object")
  91. assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Kernel")
  92. - assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Dependencies")
  93. assert ActiveSupport::Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
  94. end
Add Comment
Please, Sign In to add comment