diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 19:19:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 19:19:59 -0300 |
| commit | 48deeab90acd9f8f609fa461205a793c52f11ed2 (patch) | |
| tree | e8b4287dcc718617bf53cc78c6d7cd0074624799 /actionpack | |
| parent | 9b366b95f9aeb50388af6d247944ed63751b570a (diff) | |
| parent | 370bfda55ff11e289a8ff2464f4a6284e1f0977a (diff) | |
| download | rails-48deeab90acd9f8f609fa461205a793c52f11ed2.tar.gz rails-48deeab90acd9f8f609fa461205a793c52f11ed2.tar.bz2 rails-48deeab90acd9f8f609fa461205a793c52f11ed2.zip | |
Merge pull request #8740 from amatsuda/missing_source_file
replace use of MissingSourceFile with LoadError
Conflicts:
activesupport/test/core_ext/load_error_test.rb
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index df7382f02d..109eff10eb 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -184,7 +184,7 @@ module AbstractController module_name = name.sub(/Controller$/, '') module_path = module_name.underscore helper module_path - rescue MissingSourceFile => e + rescue LoadError => e raise e unless e.is_missing? "helpers/#{module_path}_helper" rescue NameError => e raise e unless e.missing_name? "#{module_name}Helper" |