diff options
| author | Matthew Eagar <meagar@gmail.com> | 2017-01-25 10:27:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 10:27:37 -0500 |
| commit | 255babc98b650db7469653aba6405a60efc9e608 (patch) | |
| tree | 82b8a1fe278d81bb11266648c44e55db5f53c46c /actionpack/lib | |
| parent | e524327e510996ad741ba44c5403fe7353519e40 (diff) | |
| parent | c6f7c18e25a7fb3719ae15c2d3662e340f63c164 (diff) | |
| download | rails-255babc98b650db7469653aba6405a60efc9e608.tar.gz rails-255babc98b650db7469653aba6405a60efc9e608.tar.bz2 rails-255babc98b650db7469653aba6405a60efc9e608.zip | |
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 603c2e9ea7..e7cb6347a2 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -1,4 +1,3 @@ -require "erubis" require "abstract_controller/error" require "active_support/configurable" require "active_support/descendants_tracker" @@ -22,7 +21,6 @@ module AbstractController include ActiveSupport::Configurable extend ActiveSupport::DescendantsTracker - undef_method :not_implemented class << self attr_reader :abstract alias_method :abstract?, :abstract |