kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

removes merge conflicts

Browse source
This commit is contained in:
Xavier Noria 2011-03-06 20:34:56 +01:00
parent 89d825d021
commit 3a621e7be4
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
View file

@ -3,23 +3,12 @@ class Hash
#
# options = options.reverse_merge(:size => 25, :velocity => 10)
#
<<<<<<< HEAD
# The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
# have the respective key.
#
# As contrast, using Ruby's built in <tt>merge</tt> would require writing the following:
#
# def setup(options = {})
# options = { :size => 25, :velocity => 10 }.merge(options)
# end
=======
# is equivalent to
#
# options = {:size => 25, :velocity => 10}.merge(options)
#
# This is particularly useful for initializing an options hash
# with default values.
>>>>>>> 20768176292cbcb883ab152b4aa9ed8c664771cd
def reverse_merge(other_hash)
other_hash.merge(self)
end

4
activesupport/lib/active_support/core_ext/object/blank.rb
View file

@ -13,11 +13,7 @@ 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