Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a2bd669e
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,体验更适合开发者的 AI 搜索 >>
提交
a2bd669e
编写于
3月 13, 2019
作者:
E
eileencodes
浏览文件
操作
浏览文件
下载
差异文件
Merge tag 'v6.0.0.beta3'
v6.0.0.beta3 release
上级
1dc4d49f
7c87fd56
变更
38
隐藏空白更改
内联
并排
Showing
38 changed file
with
156 addition
and
36 deletion
+156
-36
RAILS_VERSION
RAILS_VERSION
+1
-1
actioncable/CHANGELOG.md
actioncable/CHANGELOG.md
+5
-0
actioncable/lib/action_cable/gem_version.rb
actioncable/lib/action_cable/gem_version.rb
+1
-1
actioncable/package.json
actioncable/package.json
+1
-1
actionmailbox/CHANGELOG.md
actionmailbox/CHANGELOG.md
+5
-0
actionmailbox/lib/action_mailbox/gem_version.rb
actionmailbox/lib/action_mailbox/gem_version.rb
+1
-1
actionmailer/CHANGELOG.md
actionmailer/CHANGELOG.md
+5
-0
actionmailer/lib/action_mailer/gem_version.rb
actionmailer/lib/action_mailer/gem_version.rb
+1
-1
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+5
-0
actionpack/lib/action_dispatch/http/mime_negotiation.rb
actionpack/lib/action_dispatch/http/mime_negotiation.rb
+5
-0
actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
...ck/lib/action_dispatch/middleware/session/cookie_store.rb
+4
-3
actionpack/lib/action_pack/gem_version.rb
actionpack/lib/action_pack/gem_version.rb
+1
-1
actionpack/test/controller/mime/respond_to_test.rb
actionpack/test/controller/mime/respond_to_test.rb
+6
-4
actionpack/test/controller/new_base/content_negotiation_test.rb
...pack/test/controller/new_base/content_negotiation_test.rb
+12
-2
actiontext/CHANGELOG.md
actiontext/CHANGELOG.md
+5
-0
actiontext/lib/action_text/gem_version.rb
actiontext/lib/action_text/gem_version.rb
+1
-1
actiontext/package.json
actiontext/package.json
+1
-1
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+5
-0
actionview/lib/action_view/gem_version.rb
actionview/lib/action_view/gem_version.rb
+1
-1
actionview/package.json
actionview/package.json
+1
-1
activejob/CHANGELOG.md
activejob/CHANGELOG.md
+5
-0
activejob/lib/active_job/gem_version.rb
activejob/lib/active_job/gem_version.rb
+1
-1
activemodel/CHANGELOG.md
activemodel/CHANGELOG.md
+12
-6
activemodel/lib/active_model/gem_version.rb
activemodel/lib/active_model/gem_version.rb
+1
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/gem_version.rb
activerecord/lib/active_record/gem_version.rb
+1
-1
activestorage/CHANGELOG.md
activestorage/CHANGELOG.md
+5
-0
activestorage/lib/active_storage/gem_version.rb
activestorage/lib/active_storage/gem_version.rb
+1
-1
activestorage/package.json
activestorage/package.json
+1
-1
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+5
-0
activesupport/lib/active_support/gem_version.rb
activesupport/lib/active_support/gem_version.rb
+1
-1
guides/CHANGELOG.md
guides/CHANGELOG.md
+5
-0
railties/CHANGELOG.md
railties/CHANGELOG.md
+5
-0
railties/lib/rails/application.rb
railties/lib/rails/application.rb
+17
-2
railties/lib/rails/gem_version.rb
railties/lib/rails/gem_version.rb
+1
-1
railties/test/application/configuration_test.rb
railties/test/application/configuration_test.rb
+21
-1
railties/test/isolation/abstract_unit.rb
railties/test/isolation/abstract_unit.rb
+1
-0
version.rb
version.rb
+1
-1
未找到文件。
RAILS_VERSION
浏览文件 @
a2bd669e
6.0.0.beta
2
6.0.0.beta
3
actioncable/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
PostgreSQL subscription adapters now support
`channel_prefix`
option in cable.yml
*
PostgreSQL subscription adapters now support
`channel_prefix`
option in cable.yml
...
...
actioncable/lib/action_cable/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actioncable/package.json
浏览文件 @
a2bd669e
{
{
"name"
:
"@rails/actioncable"
,
"name"
:
"@rails/actioncable"
,
"version"
:
"6.0.0-beta
2
"
,
"version"
:
"6.0.0-beta
3
"
,
"description"
:
"WebSocket framework for Ruby on Rails."
,
"description"
:
"WebSocket framework for Ruby on Rails."
,
"main"
:
"app/assets/javascripts/action_cable.js"
,
"main"
:
"app/assets/javascripts/action_cable.js"
,
"files"
:
[
"files"
:
[
...
...
actionmailbox/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
Allow skipping incineration of processed emails.
*
Allow skipping incineration of processed emails.
...
...
actionmailbox/lib/action_mailbox/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actionmailer/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
No changes.
*
No changes.
...
...
actionmailer/lib/action_mailer/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actionpack/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
Make debug exceptions works in an environment where ActiveStorage is not loaded.
*
Make debug exceptions works in an environment where ActiveStorage is not loaded.
...
...
actionpack/lib/action_dispatch/http/mime_negotiation.rb
浏览文件 @
a2bd669e
...
@@ -79,6 +79,11 @@ def formats
...
@@ -79,6 +79,11 @@ def formats
else
else
[
Mime
[
:html
]]
[
Mime
[
:html
]]
end
end
v
=
v
.
select
do
|
format
|
format
.
symbol
||
format
.
ref
==
"*/*"
end
set_header
k
,
v
set_header
k
,
v
end
end
end
end
...
...
actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
浏览文件 @
a2bd669e
...
@@ -24,9 +24,10 @@ module Session
...
@@ -24,9 +24,10 @@ module Session
#
#
# Rails.application.config.session_store :cookie_store, key: '_your_app_session'
# Rails.application.config.session_store :cookie_store, key: '_your_app_session'
#
#
# By default, your secret key base is derived from your application name in
# In the development and test environments your application's secret key base is
# the test and development environments. In all other environments, it is stored
# generated by Rails and stored in a temporary file in <tt>tmp/development_secret.txt</tt>.
# encrypted in the <tt>config/credentials.yml.enc</tt> file.
# In all other environments, it is stored encrypted in the
# <tt>config/credentials.yml.enc</tt> file.
#
#
# If your application was not updated to Rails 5.2 defaults, the secret_key_base
# If your application was not updated to Rails 5.2 defaults, the secret_key_base
# will be found in the old <tt>config/secrets.yml</tt> file.
# will be found in the old <tt>config/secrets.yml</tt> file.
...
...
actionpack/lib/action_pack/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actionpack/test/controller/mime/respond_to_test.rb
浏览文件 @
a2bd669e
...
@@ -125,7 +125,7 @@ def using_non_conflicting_nested_js_then_js
...
@@ -125,7 +125,7 @@ def using_non_conflicting_nested_js_then_js
def
custom_type_handling
def
custom_type_handling
respond_to
do
|
type
|
respond_to
do
|
type
|
type
.
html
{
render
body:
"HTML"
}
type
.
html
{
render
body:
"HTML"
}
type
.
custom
(
"application/
crazy-xml"
)
{
render
body:
"Craz
y XML"
}
type
.
custom
(
"application/
fancy-xml"
)
{
render
body:
"Fanc
y XML"
}
type
.
all
{
render
body:
"Nothing"
}
type
.
all
{
render
body:
"Nothing"
}
end
end
end
end
...
@@ -314,12 +314,14 @@ def setup
...
@@ -314,12 +314,14 @@ def setup
@request
.
host
=
"www.example.com"
@request
.
host
=
"www.example.com"
Mime
::
Type
.
register_alias
(
"text/html"
,
:iphone
)
Mime
::
Type
.
register_alias
(
"text/html"
,
:iphone
)
Mime
::
Type
.
register
(
"text/x-mobile"
,
:mobile
)
Mime
::
Type
.
register
(
"text/x-mobile"
,
:mobile
)
Mime
::
Type
.
register
(
"application/fancy-xml"
,
:fancy_xml
)
end
end
def
teardown
def
teardown
super
super
Mime
::
Type
.
unregister
(
:iphone
)
Mime
::
Type
.
unregister
(
:iphone
)
Mime
::
Type
.
unregister
(
:mobile
)
Mime
::
Type
.
unregister
(
:mobile
)
Mime
::
Type
.
unregister
(
:fancy_xml
)
end
end
def
test_html
def
test_html
...
@@ -489,10 +491,10 @@ def test_synonyms
...
@@ -489,10 +491,10 @@ def test_synonyms
end
end
def
test_custom_types
def
test_custom_types
@request
.
accept
=
"application/
craz
y-xml"
@request
.
accept
=
"application/
fanc
y-xml"
get
:custom_type_handling
get
:custom_type_handling
assert_equal
"application/
craz
y-xml"
,
@response
.
content_type
assert_equal
"application/
fanc
y-xml"
,
@response
.
content_type
assert_equal
"
Craz
y XML"
,
@response
.
body
assert_equal
"
Fanc
y XML"
,
@response
.
body
@request
.
accept
=
"text/html"
@request
.
accept
=
"text/html"
get
:custom_type_handling
get
:custom_type_handling
...
...
actionpack/test/controller/new_base/content_negotiation_test.rb
浏览文件 @
a2bd669e
...
@@ -20,9 +20,19 @@ class TestContentNegotiation < Rack::TestCase
...
@@ -20,9 +20,19 @@ class TestContentNegotiation < Rack::TestCase
assert_body
"Hello world */*!"
assert_body
"Hello world */*!"
end
end
test
"Not all mimes are converted to symbol"
do
test
"A js or */* Accept header will return HTML"
do
get
"/content_negotiation/basic/hello"
,
headers:
{
"HTTP_ACCEPT"
=>
"text/javascript, */*"
}
assert_body
"Hello world text/html!"
end
test
"A js or */* Accept header on xhr will return HTML"
do
get
"/content_negotiation/basic/hello"
,
headers:
{
"HTTP_ACCEPT"
=>
"text/javascript, */*"
},
xhr:
true
assert_body
"Hello world text/javascript!"
end
test
"Unregistered mimes are ignored"
do
get
"/content_negotiation/basic/all"
,
headers:
{
"HTTP_ACCEPT"
=>
"text/plain, mime/another"
}
get
"/content_negotiation/basic/all"
,
headers:
{
"HTTP_ACCEPT"
=>
"text/plain, mime/another"
}
assert_body
'[:text
, "mime/another"
]'
assert_body
'[:text]'
end
end
end
end
end
end
actiontext/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
No changes.
*
No changes.
...
...
actiontext/lib/action_text/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actiontext/package.json
浏览文件 @
a2bd669e
{
{
"name"
:
"@rails/actiontext"
,
"name"
:
"@rails/actiontext"
,
"version"
:
"6.0.0-beta
2
"
,
"version"
:
"6.0.0-beta
3
"
,
"description"
:
"Edit and display rich text in Rails applications"
,
"description"
:
"Edit and display rich text in Rails applications"
,
"main"
:
"app/javascript/actiontext/index.js"
,
"main"
:
"app/javascript/actiontext/index.js"
,
"files"
:
[
"files"
:
[
...
...
actionview/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
ActionView::Template.finalize_compiled_template_methods is deprecated with
*
ActionView::Template.finalize_compiled_template_methods is deprecated with
...
...
actionview/lib/action_view/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
actionview/package.json
浏览文件 @
a2bd669e
{
{
"name"
:
"@rails/ujs"
,
"name"
:
"@rails/ujs"
,
"version"
:
"6.0.0-beta
2
"
,
"version"
:
"6.0.0-beta
3
"
,
"description"
:
"Ruby on Rails unobtrusive scripting adapter"
,
"description"
:
"Ruby on Rails unobtrusive scripting adapter"
,
"main"
:
"lib/assets/compiled/rails-ujs.js"
,
"main"
:
"lib/assets/compiled/rails-ujs.js"
,
"files"
:
[
"files"
:
[
...
...
activejob/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
No changes.
*
No changes.
...
...
activejob/lib/active_job/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
activemodel/CHANGELOG.md
浏览文件 @
a2bd669e
*
Change how validation error translation strings are fetched: The new behavior
*
Change how validation error translation strings are fetched: The new behavior
will first try the more specific keys, including doing locale fallback, then try
will first try the more specific keys, including doing locale fallback, then try
the less specific ones.
the less specific ones.
For example, this is the order in which keys will now be tried for a `blank`
For example, this is the order in which keys will now be tried for a `blank`
error on a `product`'s `title` attribute with current locale set to `en-US`:
error on a `product`'s `title` attribute with current locale set to `en-US`:
en-US.activerecord.errors.models.product.attributes.title.blank
en-US.activerecord.errors.models.product.attributes.title.blank
en-US.activerecord.errors.models.product.blank
en-US.activerecord.errors.models.product.blank
en-US.activerecord.errors.messages.blank
en-US.activerecord.errors.messages.blank
en.activerecord.errors.models.product.attributes.title.blank
en.activerecord.errors.models.product.attributes.title.blank
en.activerecord.errors.models.product.blank
en.activerecord.errors.models.product.blank
en.activerecord.errors.messages.blank
en.activerecord.errors.messages.blank
en-US.errors.attributes.title.blank
en-US.errors.attributes.title.blank
en-US.errors.messages.blank
en-US.errors.messages.blank
en.errors.attributes.title.blank
en.errors.attributes.title.blank
en.errors.messages.blank
en.errors.messages.blank
*Hugo Vacher*
*Hugo Vacher*
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
Fix date value when casting a multiparameter date hash to not convert
*
Fix date value when casting a multiparameter date hash to not convert
...
...
activemodel/lib/active_model/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
activerecord/CHANGELOG.md
浏览文件 @
a2bd669e
...
@@ -70,6 +70,11 @@
...
@@ -70,6 +70,11 @@
*Juani Villarejo*
*Juani Villarejo*
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
Fix prepared statements caching to be enabled even when query caching is enabled.
*
Fix prepared statements caching to be enabled even when query caching is enabled.
...
...
activerecord/lib/active_record/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
activestorage/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
No changes.
*
No changes.
...
...
activestorage/lib/active_storage/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
activestorage/package.json
浏览文件 @
a2bd669e
{
{
"name"
:
"@rails/activestorage"
,
"name"
:
"@rails/activestorage"
,
"version"
:
"6.0.0-beta
2
"
,
"version"
:
"6.0.0-beta
3
"
,
"description"
:
"Attach cloud and local files in Rails applications"
,
"description"
:
"Attach cloud and local files in Rails applications"
,
"main"
:
"app/assets/javascripts/activestorage.js"
,
"main"
:
"app/assets/javascripts/activestorage.js"
,
"files"
:
[
"files"
:
[
...
...
activesupport/CHANGELOG.md
浏览文件 @
a2bd669e
...
@@ -27,6 +27,11 @@
...
@@ -27,6 +27,11 @@
*DHH*
*DHH*
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
New autoloading based on
[
Zeitwerk
](
https://github.com/fxn/zeitwerk
)
.
*
New autoloading based on
[
Zeitwerk
](
https://github.com/fxn/zeitwerk
)
.
...
...
activesupport/lib/active_support/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
guides/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
No changes.
*
No changes.
...
...
railties/CHANGELOG.md
浏览文件 @
a2bd669e
## Rails 6.0.0.beta3 (March 11, 2019) ##
*
No changes.
## Rails 6.0.0.beta2 (February 25, 2019) ##
## Rails 6.0.0.beta2 (February 25, 2019) ##
*
Fix non-symbol access to nested hashes returned from
`Rails::Application.config_for`
*
Fix non-symbol access to nested hashes returned from
`Rails::Application.config_for`
...
...
railties/lib/rails/application.rb
浏览文件 @
a2bd669e
...
@@ -415,8 +415,8 @@ def secrets
...
@@ -415,8 +415,8 @@ def secrets
# then credentials.secret_key_base, and finally secrets.secret_key_base. For most applications,
# then credentials.secret_key_base, and finally secrets.secret_key_base. For most applications,
# the correct place to store it is in the encrypted credentials file.
# the correct place to store it is in the encrypted credentials file.
def
secret_key_base
def
secret_key_base
if
Rails
.
env
.
test?
||
Rails
.
env
.
developmen
t?
if
Rails
.
env
.
development?
||
Rails
.
env
.
tes
t?
secrets
.
secret_key_base
||
Digest
::
MD5
.
hexdigest
(
self
.
class
.
name
)
secrets
.
secret_key_base
||
=
generate_development_secret
else
else
validate_secret_key_base
(
validate_secret_key_base
(
ENV
[
"SECRET_KEY_BASE"
]
||
credentials
.
secret_key_base
||
secrets
.
secret_key_base
ENV
[
"SECRET_KEY_BASE"
]
||
credentials
.
secret_key_base
||
secrets
.
secret_key_base
...
@@ -581,6 +581,21 @@ def validate_secret_key_base(secret_key_base)
...
@@ -581,6 +581,21 @@ def validate_secret_key_base(secret_key_base)
private
private
def
generate_development_secret
if
secrets
.
secret_key_base
.
nil?
key_file
=
Rails
.
root
.
join
(
"tmp/development_secret.txt"
)
if
!
File
.
exist?
(
key_file
)
random_key
=
SecureRandom
.
hex
(
64
)
File
.
binwrite
(
key_file
,
random_key
)
end
secrets
.
secret_key_base
=
File
.
binread
(
key_file
)
end
secrets
.
secret_key_base
end
def
build_request
(
env
)
def
build_request
(
env
)
req
=
super
req
=
super
env
[
"ORIGINAL_FULLPATH"
]
=
req
.
fullpath
env
[
"ORIGINAL_FULLPATH"
]
=
req
.
fullpath
...
...
railties/lib/rails/gem_version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
railties/test/application/configuration_test.rb
浏览文件 @
a2bd669e
...
@@ -596,6 +596,27 @@ def index
...
@@ -596,6 +596,27 @@ def index
assert_equal
"some_value"
,
verifier
.
verify
(
message
)
assert_equal
"some_value"
,
verifier
.
verify
(
message
)
end
end
test
"application will generate secret_key_base in tmp file if blank in development"
do
app_file
"config/initializers/secret_token.rb"
,
<<-
RUBY
Rails.application.credentials.secret_key_base = nil
RUBY
app
"development"
assert_not_nil
app
.
secrets
.
secret_key_base
assert
File
.
exist?
(
app_path
(
"tmp/development_secret.txt"
))
end
test
"application will not generate secret_key_base in tmp file if blank in production"
do
app_file
"config/initializers/secret_token.rb"
,
<<-
RUBY
Rails.application.credentials.secret_key_base = nil
RUBY
assert_raises
ArgumentError
do
app
"production"
end
end
test
"raises when secret_key_base is blank"
do
test
"raises when secret_key_base is blank"
do
app_file
"config/initializers/secret_token.rb"
,
<<-
RUBY
app_file
"config/initializers/secret_token.rb"
,
<<-
RUBY
Rails.application.credentials.secret_key_base = nil
Rails.application.credentials.secret_key_base = nil
...
@@ -619,7 +640,6 @@ def index
...
@@ -619,7 +640,6 @@ def index
test
"application verifier can build different verifiers"
do
test
"application verifier can build different verifiers"
do
make_basic_app
do
|
application
|
make_basic_app
do
|
application
|
application
.
credentials
.
secret_key_base
=
"b3c631c314c0bbca50c1b2843150fe33"
application
.
config
.
session_store
:disabled
application
.
config
.
session_store
:disabled
end
end
...
...
railties/test/isolation/abstract_unit.rb
浏览文件 @
a2bd669e
...
@@ -226,6 +226,7 @@ def self.name; "RailtiesTestApp"; end
...
@@ -226,6 +226,7 @@ def self.name; "RailtiesTestApp"; end
@app
.
config
.
session_store
:cookie_store
,
key:
"_myapp_session"
@app
.
config
.
session_store
:cookie_store
,
key:
"_myapp_session"
@app
.
config
.
active_support
.
deprecation
=
:log
@app
.
config
.
active_support
.
deprecation
=
:log
@app
.
config
.
log_level
=
:info
@app
.
config
.
log_level
=
:info
@app
.
secrets
.
secret_key_base
=
"b3c631c314c0bbca50c1b2843150fe33"
yield
@app
if
block_given?
yield
@app
if
block_given?
@app
.
initialize!
@app
.
initialize!
...
...
version.rb
浏览文件 @
a2bd669e
...
@@ -10,7 +10,7 @@ module VERSION
...
@@ -10,7 +10,7 @@ module VERSION
MAJOR
=
6
MAJOR
=
6
MINOR
=
0
MINOR
=
0
TINY
=
0
TINY
=
0
PRE
=
"beta
2
"
PRE
=
"beta
3
"
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
STRING
=
[
MAJOR
,
MINOR
,
TINY
,
PRE
].
compact
.
join
(
"."
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录