diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/whiny_nil.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index c1da53c878..17ca446650 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -163,11 +163,11 @@ class Exception #:nodoc: def describe_blame return nil if blamed_files.empty? - "This error occured while loading the following files:\n #{blamed_files.join "\n "}" + "This error occurred while loading the following files:\n #{blamed_files.join "\n "}" end def copy_blame!(exc) @blamed_files = exc.blamed_files.clone self end -end
\ No newline at end of file +end diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb index 61cbe98e2b..cee510afbd 100644 --- a/activesupport/lib/active_support/whiny_nil.rb +++ b/activesupport/lib/active_support/whiny_nil.rb @@ -30,7 +30,7 @@ class NilClass def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil) message = "You have a nil object when you didn't expect it!" message << "\nYou might have expected an instance of #{klass}." if klass - message << "\nThe error occured while evaluating nil.#{selector}" if selector + message << "\nThe error occurred while evaluating nil.#{selector}" if selector raise NoMethodError, message, with_caller || caller end |