diff options
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index a794272a9a..22eb7dc0a3 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -257,7 +257,7 @@ module ActionController #:nodoc: # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false. def require_or_load(file_name) - reload_dependencies ? load("#{file_name}.rb") : require(file_name) + reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name) end end |