Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
68d84e25
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,发现更多精彩内容 >>
提交
68d84e25
编写于
10月 21, 2008
作者:
D
David Heinemeier Hansson
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of git@github.com:rails/rails
上级
9acb88e6
326030a1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
5 deletion
+15
-5
actionpack/lib/action_controller/dispatcher.rb
actionpack/lib/action_controller/dispatcher.rb
+2
-1
actionpack/test/controller/dispatcher_test.rb
actionpack/test/controller/dispatcher_test.rb
+9
-1
activesupport/lib/active_support/vendor.rb
activesupport/lib/active_support/vendor.rb
+1
-1
railties/lib/rails/gem_dependency.rb
railties/lib/rails/gem_dependency.rb
+1
-1
railties/lib/tasks/gems.rake
railties/lib/tasks/gems.rake
+2
-1
未找到文件。
actionpack/lib/action_controller/dispatcher.rb
浏览文件 @
68d84e25
...
...
@@ -39,7 +39,7 @@ def dispatch(cgi = nil, session_options = CgiRequest::DEFAULT_SESSION_OPTIONS, o
# Add a preparation callback. Preparation callbacks are run before every
# request in development mode, and before the first request in production
# mode.
#
#
# An optional identifier may be supplied for the callback. If provided,
# to_prepare may be called again with the same identifier to replace the
# existing callback. Passing an identifier is a suggested practice if the
...
...
@@ -144,6 +144,7 @@ def reload_application
Routing
::
Routes
.
reload
ActionController
::
Base
.
view_paths
.
reload!
ActionView
::
Helpers
::
AssetTagHelper
::
AssetTag
::
Cache
.
clear
end
# Cleanup the application by clearing out loaded classes so they can
...
...
actionpack/test/controller/dispatcher_test.rb
浏览文件 @
68d84e25
...
...
@@ -26,9 +26,17 @@ def teardown
end
def
test_clears_dependencies_after_dispatch_if_in_loading_mode
ActionController
::
Routing
::
Routes
.
expects
(
:reload
).
once
ActiveSupport
::
Dependencies
.
expects
(
:clear
).
once
dispatch
(
@output
,
false
)
end
def
test_reloads_routes_before_dispatch_if_in_loading_mode
ActionController
::
Routing
::
Routes
.
expects
(
:reload
).
once
dispatch
(
@output
,
false
)
end
def
test_clears_asset_tag_cache_before_dispatch_if_in_loading_mode
ActionView
::
Helpers
::
AssetTagHelper
::
AssetTag
::
Cache
.
expects
(
:clear
).
once
dispatch
(
@output
,
false
)
end
...
...
activesupport/lib/active_support/vendor.rb
浏览文件 @
68d84e25
...
...
@@ -22,7 +22,7 @@
begin
gem
'tzinfo'
,
'~> 0.3.11'
rescue
Gem
::
LoadError
$:
.
unshift
"
#{
File
.
dirname
(
__FILE__
)
}
/vendor/tzinfo-0.3.
9
"
$:
.
unshift
"
#{
File
.
dirname
(
__FILE__
)
}
/vendor/tzinfo-0.3.
11
"
end
# TODO I18n gem has not been released yet
...
...
railties/lib/rails/gem_dependency.rb
浏览文件 @
68d84e25
...
...
@@ -151,7 +151,7 @@ def unpack_to(directory)
end
# Gem.activate changes the spec - get the original
real_spec
=
Gem
::
Specification
.
load
(
spec
.
loaded_from
)
real_spec
=
Gem
::
Specification
.
load
(
spec
ification
.
loaded_from
)
write_spec
(
directory
,
real_spec
)
end
...
...
railties/lib/tasks/gems.rake
浏览文件 @
68d84e25
...
...
@@ -11,7 +11,7 @@ end
def
print_gem_status
(
gem
,
indent
=
1
)
code
=
gem
.
loaded?
?
(
gem
.
frozen?
?
"F"
:
"I"
)
:
" "
puts
" "
*
(
indent
-
1
)
+
" - [
#{
code
}
]
#{
gem
.
name
}
#{
gem
.
requirement
.
to_s
}
"
gem
.
dependencies
.
each
{
|
g
|
print_gem_status
(
g
,
indent
+
1
)}
gem
.
dependencies
.
each
{
|
g
|
print_gem_status
(
g
,
indent
+
1
)}
if
gem
.
loaded?
end
namespace
:gems
do
...
...
@@ -70,6 +70,7 @@ namespace :gems do
task
:refresh_specs
=>
:base
do
require
'rubygems'
require
'rubygems/gem_runner'
Rails
::
VendorGemSourceIndex
.
silence_spec_warnings
=
true
Rails
.
configuration
.
gems
.
each
do
|
gem
|
next
unless
gem
.
frozen?
&&
(
ENV
[
'GEM'
].
blank?
||
ENV
[
'GEM'
]
==
gem
.
name
)
gem
.
refresh_spec
(
Rails
::
GemDependency
.
unpacked_path
)
if
gem
.
loaded?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录