Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
91ce8d8b
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,发现更多精彩内容 >>
提交
91ce8d8b
编写于
12月 20, 2009
作者:
D
David Heinemeier Hansson
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:rails/rails
上级
cf9d6a95
29c8a430
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
67 addition
and
84 deletion
+67
-84
actionpack/lib/action_controller.rb
actionpack/lib/action_controller.rb
+1
-2
actionpack/lib/action_controller/base.rb
actionpack/lib/action_controller/base.rb
+1
-2
actionpack/lib/action_controller/metal.rb
actionpack/lib/action_controller/metal.rb
+3
-3
actionpack/lib/action_controller/metal/conditional_get.rb
actionpack/lib/action_controller/metal/conditional_get.rb
+1
-1
actionpack/lib/action_controller/metal/cookies.rb
actionpack/lib/action_controller/metal/cookies.rb
+1
-1
actionpack/lib/action_controller/metal/flash.rb
actionpack/lib/action_controller/metal/flash.rb
+4
-6
actionpack/lib/action_controller/metal/rack_delegation.rb
actionpack/lib/action_controller/metal/rack_delegation.rb
+2
-1
actionpack/lib/action_controller/metal/request_forgery_protection.rb
...lib/action_controller/metal/request_forgery_protection.rb
+16
-16
actionpack/lib/action_controller/metal/session.rb
actionpack/lib/action_controller/metal/session.rb
+0
-15
actionpack/lib/action_controller/metal/testing.rb
actionpack/lib/action_controller/metal/testing.rb
+1
-1
actionpack/lib/action_controller/metal/url_for.rb
actionpack/lib/action_controller/metal/url_for.rb
+1
-1
actionpack/lib/action_controller/metal/verification.rb
actionpack/lib/action_controller/metal/verification.rb
+35
-35
activesupport/lib/active_support/core_ext/time/calculations.rb
...esupport/lib/active_support/core_ext/time/calculations.rb
+1
-0
未找到文件。
actionpack/lib/action_controller.rb
浏览文件 @
91ce8d8b
...
...
@@ -22,14 +22,13 @@ module ActionController
autoload
:HideActions
autoload
:Layouts
autoload
:MimeResponds
autoload
:Rack
Convenience
autoload
:Rack
Delegation
autoload
:Compatibility
autoload
:Redirecting
autoload
:Rendering
autoload
:Renderers
autoload
:Rescue
autoload
:Responder
autoload
:Session
autoload
:SessionManagement
autoload
:UrlFor
autoload
:Verification
...
...
actionpack/lib/action_controller/base.rb
浏览文件 @
91ce8d8b
...
...
@@ -13,7 +13,7 @@ class Base < Metal
include
ActionController
::
Renderers
::
All
include
ActionController
::
Layouts
include
ActionController
::
ConditionalGet
include
ActionController
::
Rack
Convenience
include
ActionController
::
Rack
Delegation
include
ActionController
::
Benchmarking
include
ActionController
::
Configuration
...
...
@@ -26,7 +26,6 @@ class Base < Metal
include
ActionController
::
Compatibility
include
ActionController
::
Cookies
include
ActionController
::
Session
include
ActionController
::
Flash
include
ActionController
::
Verification
include
ActionController
::
RequestForgeryProtection
...
...
actionpack/lib/action_controller/metal.rb
浏览文件 @
91ce8d8b
...
...
@@ -45,7 +45,7 @@ def controller_path
# The details below can be overridden to support a specific
# Request and Response object. The default ActionController::Base
# implementation includes Rack
Convenience
, which makes a request
# implementation includes Rack
Delegation
, which makes a request
# and response object available. You might wish to control the
# environment and response manually for performance reasons.
...
...
@@ -57,8 +57,8 @@ def initialize(*)
end
# Basic implementations for content_type=, location=, and headers are
# provided to reduce the dependency on the Rack
Convenience
module
# in Render
ing and Redirecting
.
# provided to reduce the dependency on the Rack
Delegation
module
# in Render
er and Redirector
.
def
content_type
=
(
type
)
headers
[
"Content-Type"
]
=
type
.
to_s
...
...
actionpack/lib/action_controller/metal/conditional_get.rb
浏览文件 @
91ce8d8b
...
...
@@ -2,7 +2,7 @@ module ActionController
module
ConditionalGet
extend
ActiveSupport
::
Concern
include
Rack
Convenience
include
Rack
Delegation
include
Head
# Sets the etag, last_modified, or both on the response and renders a
...
...
actionpack/lib/action_controller/metal/cookies.rb
浏览文件 @
91ce8d8b
...
...
@@ -46,7 +46,7 @@ module ActionController #:nodoc:
module
Cookies
extend
ActiveSupport
::
Concern
include
Rack
Convenience
include
Rack
Delegation
included
do
helper_method
:cookies
...
...
actionpack/lib/action_controller/metal/flash.rb
浏览文件 @
91ce8d8b
...
...
@@ -28,8 +28,6 @@ module ActionController #:nodoc:
module
Flash
extend
ActiveSupport
::
Concern
include
Session
included
do
helper_method
:alert
,
:notice
end
...
...
actionpack/lib/action_controller/metal/rack_
convenience
.rb
→
actionpack/lib/action_controller/metal/rack_
delegation
.rb
浏览文件 @
91ce8d8b
module
ActionController
module
Rack
Convenience
module
Rack
Delegation
extend
ActiveSupport
::
Concern
included
do
delegate
:session
,
:reset_session
,
:to
=>
"@_request"
delegate
:headers
,
:status
=
,
:location
=
,
:content_type
=
,
:status
,
:location
,
:content_type
,
:to
=>
"@_response"
attr_internal
:request
...
...
actionpack/lib/action_controller/metal/request_forgery_protection.rb
浏览文件 @
91ce8d8b
...
...
@@ -5,7 +5,7 @@ class InvalidAuthenticityToken < ActionControllerError #:nodoc:
module
RequestForgeryProtection
extend
ActiveSupport
::
Concern
include
AbstractController
::
Helpers
,
Session
include
AbstractController
::
Helpers
included
do
# Sets the token parameter name for RequestForgery. Calling +protect_from_forgery+
...
...
actionpack/lib/action_controller/metal/session.rb
已删除
100644 → 0
浏览文件 @
cf9d6a95
module
ActionController
module
Session
extend
ActiveSupport
::
Concern
include
RackConvenience
def
session
@_request
.
session
end
def
reset_session
@_request
.
reset_session
end
end
end
actionpack/lib/action_controller/metal/testing.rb
浏览文件 @
91ce8d8b
...
...
@@ -2,7 +2,7 @@ module ActionController
module
Testing
extend
ActiveSupport
::
Concern
include
Rack
Convenience
include
Rack
Delegation
# OMG MEGA HAX
def
process_with_new_base_test
(
request
,
response
)
...
...
actionpack/lib/action_controller/metal/url_for.rb
浏览文件 @
91ce8d8b
...
...
@@ -2,7 +2,7 @@ module ActionController
module
UrlFor
extend
ActiveSupport
::
Concern
include
Rack
Convenience
include
Rack
Delegation
# Overwrite to implement a number of default options that all url_for-based methods will use. The default options should come in
# the form of a hash, just like the one you would use for url_for directly. Example:
...
...
actionpack/lib/action_controller/metal/verification.rb
浏览文件 @
91ce8d8b
...
...
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
module
Verification
#:nodoc:
extend
ActiveSupport
::
Concern
include
AbstractController
::
Callbacks
,
Session
,
Flash
,
Rendering
include
AbstractController
::
Callbacks
,
Flash
,
Rendering
# This module provides a class-level method for specifying that certain
# actions are guarded against being called without certain prerequisites
...
...
activesupport/lib/active_support/core_ext/time/calculations.rb
浏览文件 @
91ce8d8b
require
'active_support/duration'
require
'active_support/core_ext/date/acts_like'
require
'active_support/core_ext/date/calculations'
class
Time
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录