diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-09-01 23:41:49 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2016-09-01 23:41:49 +0200 |
| commit | bb1ecdcc677bf6e68e0252505509c089619b5b90 (patch) | |
| tree | 99dd8fd164e1c582216a4b08c3d066049217bb7f /activesupport/lib/active_support/dependencies.rb | |
| parent | 8c402ef425771c3dbb4659dd946714e69fdf5ce9 (diff) | |
| download | rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.tar.gz rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.tar.bz2 rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.zip | |
fixes remaining RuboCop issues [Vipul A M, Xavier Noria]
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 158bb402bd..216d52164e 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -371,7 +371,7 @@ module ActiveSupport #:nodoc: load_args = ["#{file_name}.rb"] load_args << const_path unless const_path.nil? - if !warnings_on_first_load or history.include?(expanded) + if !warnings_on_first_load || history.include?(expanded) result = load_file(*load_args) else enable_warnings { result = load_file(*load_args) } |