aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-02-12 22:29:59 -0300
committerGitHub <noreply@github.com>2017-02-12 22:29:59 -0300
commit60c5d393bb642e9228c07948fd8fb73be2ad1526 (patch)
tree8f5b2237949e808c953c1c9d416a9e6ba909fd42
parente8f170cec11873bfaab68d8b24737adb7b9331c6 (diff)
parent5b2b6282f54a6af69f5a96e8b7d0e8ede8e36f5a (diff)
downloadrails-60c5d393bb642e9228c07948fd8fb73be2ad1526.tar.gz
rails-60c5d393bb642e9228c07948fd8fb73be2ad1526.tar.bz2
rails-60c5d393bb642e9228c07948fd8fb73be2ad1526.zip
Merge pull request #27982 from Edouard-chin/removes-extra-require-call
Removed the `attribute_accessors` required file:
-rw-r--r--actionpack/lib/action_dispatch/http/mime_type.rb1
-rw-r--r--activesupport/lib/active_support/callbacks.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 1a65e2d1cb..1583a8f87f 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -1,7 +1,6 @@
# -*- frozen-string-literal: true -*-
require "singleton"
-require "active_support/core_ext/module/attribute_accessors"
require "active_support/core_ext/string/starts_ends_with"
module Mime
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 0bee35135b..ea71569ca8 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -4,7 +4,6 @@ require "active_support/core_ext/array/extract_options"
require "active_support/core_ext/class/attribute"
require "active_support/core_ext/kernel/reporting"
require "active_support/core_ext/kernel/singleton_class"
-require "active_support/core_ext/module/attribute_accessors"
require "active_support/core_ext/string/filters"
require "active_support/deprecation"
require "thread"