diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-06 17:52:30 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-06 17:52:30 +0100 |
| commit | 89d825d02172f7c1ba1211119ea9844206aae9c3 (patch) | |
| tree | 4716db6c964db1b81843523932be4b097b9291db /activesupport/lib/active_support/core_ext/object | |
| parent | 5e7ce47fb9ab50858fe067a6eb6c0462c5c5681e (diff) | |
| parent | 6ce844a3c1d9c1de4ae54cbe73e0dbd0acbe688a (diff) | |
| download | rails-89d825d02172f7c1ba1211119ea9844206aae9c3.tar.gz rails-89d825d02172f7c1ba1211119ea9844206aae9c3.tar.bz2 rails-89d825d02172f7c1ba1211119ea9844206aae9c3.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/core_ext/object')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/blank.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb index d0c1ea8326..7b5832b51a 100644 --- a/activesupport/lib/active_support/core_ext/object/blank.rb +++ b/activesupport/lib/active_support/core_ext/object/blank.rb @@ -13,7 +13,11 @@ class Object respond_to?(:empty?) ? empty? : !self end +<<<<<<< HEAD + # An object is present if it's not #blank?. +======= # An object is present if it's not <tt>blank?</tt>. +>>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd def present? !blank? end |