diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
| commit | ba154bd76fb481d9faca123e988924bd864c0318 (patch) | |
| tree | 89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/lib/action_view | |
| parent | 422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff) | |
| parent | 96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff) | |
| download | rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2 rails-ba154bd76fb481d9faca123e988924bd864c0318.zip | |
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/lookup_context.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index 90d88ca967..90c4a2759a 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -152,6 +152,7 @@ module ActionView def normalize_name(name, prefixes) #:nodoc: prefixes = nil if prefixes.blank? parts = name.to_s.split('/') + parts.shift if parts.first.empty? name = parts.pop return name, prefixes || [""] if parts.empty? diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index c734c914db..b00f69e636 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -233,10 +233,8 @@ module ActionView super end end - end include Behavior - end end |