Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
eb83c9cf
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,发现更多精彩内容 >>
提交
eb83c9cf
编写于
4月 18, 2010
作者:
C
Carl Lerche
浏览文件
操作
浏览文件
下载
差异文件
Merge remote branch 'spastorino/master'
上级
d32a4cba
978c80d6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
15 deletion
+6
-15
actionpack/lib/action_controller/caching.rb
actionpack/lib/action_controller/caching.rb
+3
-2
actionpack/lib/action_dispatch/middleware/params_parser.rb
actionpack/lib/action_dispatch/middleware/params_parser.rb
+1
-0
actionpack/lib/action_view/helpers/cache_helper.rb
actionpack/lib/action_view/helpers/cache_helper.rb
+1
-1
activerecord/test/cases/xml_serialization_test.rb
activerecord/test/cases/xml_serialization_test.rb
+1
-0
activesupport/lib/active_support/core_ext/benchmark.rb
activesupport/lib/active_support/core_ext/benchmark.rb
+0
-12
未找到文件。
actionpack/lib/action_controller/caching.rb
浏览文件 @
eb83c9cf
...
@@ -63,8 +63,9 @@ def cache_configured?
...
@@ -63,8 +63,9 @@ def cache_configured?
included
do
included
do
extend
ConfigMethods
extend
ConfigMethods
@@perform_caching
=
true
delegate
:perform_caching
,
:perform_caching
=
,
:to
=>
:config
cattr_accessor
:perform_caching
singleton_class
.
delegate
:perform_caching
,
:perform_caching
=
,
:to
=>
:config
self
.
perform_caching
=
true
end
end
...
...
actionpack/lib/action_dispatch/middleware/params_parser.rb
浏览文件 @
eb83c9cf
require
'active_support/core_ext/hash/conversions.rb'
require
'action_dispatch/http/request'
require
'action_dispatch/http/request'
module
ActionDispatch
module
ActionDispatch
...
...
actionpack/lib/action_view/helpers/cache_helper.rb
浏览文件 @
eb83c9cf
...
@@ -39,7 +39,7 @@ def cache(name = {}, options = nil, &block)
...
@@ -39,7 +39,7 @@ def cache(name = {}, options = nil, &block)
private
private
# TODO: Create an object that has caching read/write on it
# TODO: Create an object that has caching read/write on it
def
fragment_for
(
name
=
{},
options
=
nil
,
&
block
)
#:nodoc:
def
fragment_for
(
name
=
{},
options
=
nil
,
&
block
)
#:nodoc:
if
controller
.
class
.
perform_caching
if
controller
.
perform_caching
if
controller
.
fragment_exist?
(
name
,
options
)
if
controller
.
fragment_exist?
(
name
,
options
)
controller
.
read_fragment
(
name
,
options
)
controller
.
read_fragment
(
name
,
options
)
else
else
...
...
activerecord/test/cases/xml_serialization_test.rb
浏览文件 @
eb83c9cf
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
require
'models/author'
require
'models/author'
require
'models/tagging'
require
'models/tagging'
require
'models/comment'
require
'models/comment'
require
'models/company_in_module'
class
XmlSerializationTest
<
ActiveRecord
::
TestCase
class
XmlSerializationTest
<
ActiveRecord
::
TestCase
def
test_should_serialize_default_root
def
test_should_serialize_default_root
...
...
activesupport/lib/active_support/core_ext/benchmark.rb
浏览文件 @
eb83c9cf
require
'benchmark'
require
'benchmark'
class
<<
Benchmark
class
<<
Benchmark
# Earlier Ruby had a slower implementation.
if
RUBY_VERSION
<
'1.8.7'
remove_method
:realtime
def
realtime
r0
=
Time
.
now
yield
r1
=
Time
.
now
r1
.
to_f
-
r0
.
to_f
end
end
def
ms
def
ms
1000
*
realtime
{
yield
}
1000
*
realtime
{
yield
}
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录