Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3a621e7b
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3a621e7b
编写于
3月 06, 2011
作者:
X
Xavier Noria
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removes merge conflicts
上级
89d825d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
0 addition
and
15 deletion
+0
-15
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
...support/lib/active_support/core_ext/hash/reverse_merge.rb
+0
-11
activesupport/lib/active_support/core_ext/object/blank.rb
activesupport/lib/active_support/core_ext/object/blank.rb
+0
-4
未找到文件。
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
浏览文件 @
3a621e7b
...
@@ -3,23 +3,12 @@ class Hash
...
@@ -3,23 +3,12 @@ class Hash
#
#
# options = options.reverse_merge(:size => 25, :velocity => 10)
# 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
# is equivalent to
#
#
# options = {:size => 25, :velocity => 10}.merge(options)
# options = {:size => 25, :velocity => 10}.merge(options)
#
#
# This is particularly useful for initializing an options hash
# This is particularly useful for initializing an options hash
# with default values.
# with default values.
>>>>>>>
20768176292
cbcb883ab152b4aa9ed8c664771cd
def
reverse_merge
(
other_hash
)
def
reverse_merge
(
other_hash
)
other_hash
.
merge
(
self
)
other_hash
.
merge
(
self
)
end
end
...
...
activesupport/lib/active_support/core_ext/object/blank.rb
浏览文件 @
3a621e7b
...
@@ -13,11 +13,7 @@ def blank?
...
@@ -13,11 +13,7 @@ def blank?
respond_to?
(
:empty?
)
?
empty?
:
!
self
respond_to?
(
:empty?
)
?
empty?
:
!
self
end
end
<<<<<<<
HEAD
# An object is present if it's not #blank?.
=======
# An object is present if it's not <tt>blank?</tt>.
# An object is present if it's not <tt>blank?</tt>.
>>>>>>>
20768176292
cbcb883ab152b4aa9ed8c664771cd
def
present?
def
present?
!
blank?
!
blank?
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录