Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f6797a76
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,发现更多精彩内容 >>
提交
f6797a76
编写于
6月 21, 2015
作者:
V
Vijay Dev
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:rails/docrails
Conflicts: guides/source/configuring.md
上级
29959eb5
29a64f23
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
9 addition
and
11 deletion
+9
-11
actionview/lib/action_view/digestor.rb
actionview/lib/action_view/digestor.rb
+1
-1
actionview/lib/action_view/helpers/date_helper.rb
actionview/lib/action_view/helpers/date_helper.rb
+1
-1
actionview/lib/action_view/lookup_context.rb
actionview/lib/action_view/lookup_context.rb
+1
-1
actionview/lib/action_view/rendering.rb
actionview/lib/action_view/rendering.rb
+1
-1
actionview/lib/action_view/view_paths.rb
actionview/lib/action_view/view_paths.rb
+2
-2
activejob/lib/active_job/queue_name.rb
activejob/lib/active_job/queue_name.rb
+1
-1
guides/source/action_view_overview.md
guides/source/action_view_overview.md
+2
-2
guides/source/rails_on_rack.md
guides/source/rails_on_rack.md
+0
-2
未找到文件。
actionview/lib/action_view/digestor.rb
浏览文件 @
f6797a76
...
...
@@ -12,7 +12,7 @@ class << self
# Supported options:
#
# * <tt>name</tt> - Template name
# * <tt>finder</tt> - An instance of
ActionView::LookupContext
# * <tt>finder</tt> - An instance of
<tt>ActionView::LookupContext</tt>
# * <tt>dependencies</tt> - An array of dependent views
# * <tt>partial</tt> - Specifies whether the template is a partial
def
digest
(
options
)
...
...
actionview/lib/action_view/helpers/date_helper.rb
浏览文件 @
f6797a76
...
...
@@ -485,7 +485,7 @@ def select_time(datetime = Time.current, options = {}, html_options = {})
# The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
# Override the field name using the <tt>:field_name</tt> option, 'second' by default.
#
# my_time = Time.now + 16.
minute
s
# my_time = Time.now + 16.
second
s
#
# # Generates a select field for seconds that defaults to the seconds for the time in my_time.
# select_second(my_time)
...
...
actionview/lib/action_view/lookup_context.rb
浏览文件 @
f6797a76
...
...
@@ -6,7 +6,7 @@
module
ActionView
# = Action View Lookup Context
#
#
LookupContext
is the object responsible to hold all information required to lookup
#
<tt>LookupContext</tt>
is the object responsible to hold all information required to lookup
# templates, i.e. view paths and details. The LookupContext is also responsible to
# generate a key, given to view paths, used in the resolver cache lookup. Since
# this key is generated just once during the request, it speeds up all cache accesses.
...
...
actionview/lib/action_view/rendering.rb
浏览文件 @
f6797a76
...
...
@@ -59,7 +59,7 @@ def view_context_class
@_view_context_class
||=
self
.
class
.
view_context_class
end
# An instance of a view class. The default view class is ActionView::Base
# An instance of a view class. The default view class is ActionView::Base
.
#
# The view class must have the following methods:
# View.new[lookup_context, assigns, controller]
...
...
actionview/lib/action_view/view_paths.rb
浏览文件 @
f6797a76
...
...
@@ -36,8 +36,8 @@ def _prefixes # :nodoc:
self
.
class
.
_prefixes
end
#
LookupContext
is the object responsible to hold all information required to lookup
# templates, i.e. view paths and details. Check
ActionView::LookupContext
for more
#
<tt>LookupContext</tt>
is the object responsible to hold all information required to lookup
# templates, i.e. view paths and details. Check
<tt>ActionView::LookupContext</tt>
for more
# information.
def
lookup_context
@_lookup_context
||=
...
...
activejob/lib/active_job/queue_name.rb
浏览文件 @
f6797a76
...
...
@@ -39,7 +39,7 @@ def queue_name_from_part(part_name) #:nodoc:
self
.
queue_name_delimiter
=
'_'
# set default delimiter to '_'
end
# Returns the name of the queue the job will be run on
# Returns the name of the queue the job will be run on
.
def
queue_name
if
@queue_name
.
is_a?
(
Proc
)
@queue_name
=
self
.
class
.
queue_name_from_part
(
instance_exec
(
&
@queue_name
))
...
...
guides/source/action_view_overview.md
浏览文件 @
f6797a76
...
...
@@ -725,7 +725,7 @@ Returns a select tag with options for each of the seconds 0 through 59 with the
```
ruby
# Generates a select field for seconds that defaults to the seconds for the time provided
select_second
(
Time
.
now
+
16
.
minute
s
)
select_second
(
Time
.
now
+
16
.
second
s
)
```
#### select_time
...
...
@@ -1429,7 +1429,7 @@ This sanitize helper will HTML encode all tags and strip all attributes that are
sanitize
@article
.
body
```
If either the
`:attributes`
or
`:tags`
options are passed, only the mentioned
tags and attribute
s are allowed and nothing else.
If either the
`:attributes`
or
`:tags`
options are passed, only the mentioned
attributes and tag
s are allowed and nothing else.
```
ruby
sanitize
@article
.
body
,
tags:
%w(table tr td)
,
attributes:
%w(id class style)
...
...
guides/source/rails_on_rack.md
浏览文件 @
f6797a76
...
...
@@ -327,8 +327,6 @@ Resources
*
[
Official Rack Website
](
http://rack.github.io
)
*
[
Introducing Rack
](
http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
)
*
[
Ruby on Rack #1 - Hello Rack!
](
http://m.onkey.org/ruby-on-rack-1-hello-rack
)
*
[
Ruby on Rack #2 - The Builder
](
http://m.onkey.org/ruby-on-rack-2-the-builder
)
### Understanding Middlewares
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录