Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9ce01dbf
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,发现更多精彩内容 >>
提交
9ce01dbf
编写于
7月 13, 2014
作者:
Z
Zachary Scott
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16155 from mechanicles/fix-typos
[ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'.
上级
ccac6082
dfee0327
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+1
-1
actionpack/test/controller/new_base/render_template_test.rb
actionpack/test/controller/new_base/render_template_test.rb
+2
-2
actionview/lib/action_view/helpers/output_safety_helper.rb
actionview/lib/action_view/helpers/output_safety_helper.rb
+1
-1
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
9ce01dbf
...
...
@@ -394,7 +394,7 @@ module ActionMailer
# implement for a custom delivery agent.
#
# * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you
# call <tt>.deliver</tt> on an mail message or on an Action Mailer method. This is on by default but can
# call <tt>.deliver</tt> on an
e
mail message or on an Action Mailer method. This is on by default but can
# be turned off to aid in functional testing.
#
# * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with
...
...
actionpack/test/controller/new_base/render_template_test.rb
浏览文件 @
9ce01dbf
...
...
@@ -9,7 +9,7 @@ class WithoutLayoutController < ActionController::Base
"locals.html.erb"
=>
"The secret is <%= secret %>"
,
"xml_template.xml.builder"
=>
"xml.html do
\n
xml.p 'Hello'
\n
end"
,
"with_raw.html.erb"
=>
"Hello <%=raw '<strong>this is raw</strong>' %>"
,
"with_implicit_raw.html.erb"
=>
"Hello <%== '<strong>this is also raw</strong>' %> in a html template"
,
"with_implicit_raw.html.erb"
=>
"Hello <%== '<strong>this is also raw</strong>' %> in a
n
html template"
,
"with_implicit_raw.text.erb"
=>
"Hello <%== '<strong>this is also raw</strong>' %> in a text template"
,
"test/with_json.html.erb"
=>
"<%= render :template => 'test/with_json', :formats => [:json] %>"
,
"test/with_json.json.erb"
=>
"<%= render :template => 'test/final', :formats => [:json] %>"
,
...
...
@@ -114,7 +114,7 @@ class TestWithoutLayout < Rack::TestCase
get
:with_implicit_raw
assert_body
"Hello <strong>this is also raw</strong> in a html template"
assert_body
"Hello <strong>this is also raw</strong> in a
n
html template"
assert_status
200
get
:with_implicit_raw
,
format:
'text'
...
...
actionview/lib/action_view/helpers/output_safety_helper.rb
浏览文件 @
9ce01dbf
...
...
@@ -17,7 +17,7 @@ def raw(stringish)
stringish
.
to_s
.
html_safe
end
# This method returns a html safe string similar to what <tt>Array#join</tt>
# This method returns a
n
html safe string similar to what <tt>Array#join</tt>
# would return. The array is flattened, and all items, including
# the supplied separator, are html escaped unless they are html
# safe, and the returned string is marked as html safe.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录