Skip to content

Commit 6c08d48

Browse files
committed
Start Rails 5.2 development
1 parent 88b1684 commit 6c08d48

File tree

34 files changed

+90
-2447
lines changed

34 files changed

+90
-2447
lines changed

Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ end
77

88
gemspec
99

10+
gem "arel", github: "rails/arel"
11+
1012
# We need a newish Rake since Active Job sets its test tasks' descriptions.
1113
gem "rake", ">= 11.1"
1214

Gemfile.lock

+41-35
Original file line numberDiff line numberDiff line change
@@ -23,61 +23,67 @@ GIT
2323
event_emitter
2424
websocket
2525

26+
GIT
27+
remote: https://github.com/rails/arel.git
28+
revision: 437aa3a4bb8ad4f3f4eba299dbb1112852f9c7ac
29+
specs:
30+
arel (8.0.0)
31+
2632
PATH
2733
remote: .
2834
specs:
29-
actioncable (5.1.0.beta1)
30-
actionpack (= 5.1.0.beta1)
35+
actioncable (5.2.0.alpha)
36+
actionpack (= 5.2.0.alpha)
3137
nio4r (~> 2.0)
3238
websocket-driver (~> 0.6.1)
33-
actionmailer (5.1.0.beta1)
34-
actionpack (= 5.1.0.beta1)
35-
actionview (= 5.1.0.beta1)
36-
activejob (= 5.1.0.beta1)
39+
actionmailer (5.2.0.alpha)
40+
actionpack (= 5.2.0.alpha)
41+
actionview (= 5.2.0.alpha)
42+
activejob (= 5.2.0.alpha)
3743
mail (~> 2.5, >= 2.5.4)
3844
rails-dom-testing (~> 2.0)
39-
actionpack (5.1.0.beta1)
40-
actionview (= 5.1.0.beta1)
41-
activesupport (= 5.1.0.beta1)
45+
actionpack (5.2.0.alpha)
46+
actionview (= 5.2.0.alpha)
47+
activesupport (= 5.2.0.alpha)
4248
rack (~> 2.0)
4349
rack-test (~> 0.6.3)
4450
rails-dom-testing (~> 2.0)
4551
rails-html-sanitizer (~> 1.0, >= 1.0.2)
46-
actionview (5.1.0.beta1)
47-
activesupport (= 5.1.0.beta1)
52+
actionview (5.2.0.alpha)
53+
activesupport (= 5.2.0.alpha)
4854
builder (~> 3.1)
4955
erubi (~> 1.4)
5056
rails-dom-testing (~> 2.0)
5157
rails-html-sanitizer (~> 1.0, >= 1.0.3)
52-
activejob (5.1.0.beta1)
53-
activesupport (= 5.1.0.beta1)
58+
activejob (5.2.0.alpha)
59+
activesupport (= 5.2.0.alpha)
5460
globalid (>= 0.3.6)
55-
activemodel (5.1.0.beta1)
56-
activesupport (= 5.1.0.beta1)
57-
activerecord (5.1.0.beta1)
58-
activemodel (= 5.1.0.beta1)
59-
activesupport (= 5.1.0.beta1)
61+
activemodel (5.2.0.alpha)
62+
activesupport (= 5.2.0.alpha)
63+
activerecord (5.2.0.alpha)
64+
activemodel (= 5.2.0.alpha)
65+
activesupport (= 5.2.0.alpha)
6066
arel (~> 8.0)
61-
activesupport (5.1.0.beta1)
67+
activesupport (5.2.0.alpha)
6268
concurrent-ruby (~> 1.0, >= 1.0.2)
6369
i18n (~> 0.7)
6470
minitest (~> 5.1)
6571
tzinfo (~> 1.1)
66-
rails (5.1.0.beta1)
67-
actioncable (= 5.1.0.beta1)
68-
actionmailer (= 5.1.0.beta1)
69-
actionpack (= 5.1.0.beta1)
70-
actionview (= 5.1.0.beta1)
71-
activejob (= 5.1.0.beta1)
72-
activemodel (= 5.1.0.beta1)
73-
activerecord (= 5.1.0.beta1)
74-
activesupport (= 5.1.0.beta1)
72+
rails (5.2.0.alpha)
73+
actioncable (= 5.2.0.alpha)
74+
actionmailer (= 5.2.0.alpha)
75+
actionpack (= 5.2.0.alpha)
76+
actionview (= 5.2.0.alpha)
77+
activejob (= 5.2.0.alpha)
78+
activemodel (= 5.2.0.alpha)
79+
activerecord (= 5.2.0.alpha)
80+
activesupport (= 5.2.0.alpha)
7581
bundler (>= 1.3.0, < 2.0)
76-
railties (= 5.1.0.beta1)
82+
railties (= 5.2.0.alpha)
7783
sprockets-rails (>= 2.0.0)
78-
railties (5.1.0.beta1)
79-
actionpack (= 5.1.0.beta1)
80-
activesupport (= 5.1.0.beta1)
84+
railties (5.2.0.alpha)
85+
actionpack (= 5.2.0.alpha)
86+
activesupport (= 5.2.0.alpha)
8187
method_source
8288
rake (>= 0.8.7)
8389
thor (>= 0.18.1, < 2.0)
@@ -88,7 +94,6 @@ GEM
8894
addressable (2.5.0)
8995
public_suffix (~> 2.0, >= 2.0.2)
9096
amq-protocol (2.1.0)
91-
arel (8.0.0)
9297
ast (2.3.0)
9398
backburner (1.3.1)
9499
beaneater (~> 1.0)
@@ -159,7 +164,7 @@ GEM
159164
http_parser.rb (>= 0.6.0)
160165
em-socksify (0.3.1)
161166
eventmachine (>= 1.0.0.beta.4)
162-
erubi (1.4.0)
167+
erubi (1.6.0)
163168
erubis (2.7.0)
164169
event_emitter (0.2.5)
165170
eventmachine (1.2.1)
@@ -371,6 +376,7 @@ DEPENDENCIES
371376
activerecord-jdbcmysql-adapter (>= 1.3.0)
372377
activerecord-jdbcpostgresql-adapter (>= 1.3.0)
373378
activerecord-jdbcsqlite3-adapter (>= 1.3.0)
379+
arel!
374380
backburner
375381
bcrypt (~> 3.1.11)
376382
benchmark-ips
@@ -427,4 +433,4 @@ DEPENDENCIES
427433
websocket-client-simple!
428434

429435
BUNDLED WITH
430-
1.14.4
436+
1.14.5

RAILS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0.beta1
1+
5.2.0.alpha

actioncable/CHANGELOG.md

+1-45
Original file line numberDiff line numberDiff line change
@@ -1,45 +1 @@
1-
## Rails 5.1.0.beta1 (February 23, 2017) ##
2-
3-
* Redis subscription adapters now support `channel_prefix` option in `cable.yml`
4-
5-
Avoids channel name collisions when multiple apps use the same Redis server.
6-
7-
*Chad Ingram*
8-
9-
* Permit same-origin connections by default.
10-
11-
Added new option `config.action_cable.allow_same_origin_as_host = false`
12-
to disable this behaviour.
13-
14-
*Dávid Halász*, *Matthew Draper*
15-
16-
* Prevent race where the client could receive and act upon a
17-
subscription confirmation before the channel's `subscribed` method
18-
completed.
19-
20-
Fixes #25381.
21-
22-
*Vladimir Dementyev*
23-
24-
* Buffer now writes to WebSocket connections, to avoid blocking threads
25-
that could be doing more useful things.
26-
27-
*Matthew Draper*, *Tinco Andringa*
28-
29-
* Protect against concurrent writes to a WebSocket connection from
30-
multiple threads; the underlying OS write is not always threadsafe.
31-
32-
*Tinco Andringa*
33-
34-
* Add `ActiveSupport::Notifications` hook to `Broadcaster#broadcast`.
35-
36-
*Matthew Wear*
37-
38-
* Close hijacked socket when connection is shut down.
39-
40-
Fixes #25613.
41-
42-
*Tinco Andringa*
43-
44-
45-
Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.
1+
Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actioncable/CHANGELOG.md) for previous changes.

actioncable/lib/action_cable/gem_version.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ def self.gem_version
66

77
module VERSION
88
MAJOR = 5
9-
MINOR = 1
9+
MINOR = 2
1010
TINY = 0
11-
PRE = "beta1"
11+
PRE = "alpha"
1212

1313
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1414
end

actioncable/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "actioncable",
3-
"version": "5.1.0-beta1",
3+
"version": "5.2.0-alpha",
44
"description": "WebSocket framework for Ruby on Rails.",
55
"main": "lib/assets/compiled/action_cable.js",
66
"files": [

actionmailer/CHANGELOG.md

+1-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1 @@
1-
## Rails 5.1.0.beta1 (February 23, 2017) ##
2-
3-
* Add `:args` to `process.action_mailer` event.
4-
5-
*Yuji Yaginuma*
6-
7-
* Add parameterized invocation of mailers as a way to share before filters and defaults between actions.
8-
See `ActionMailer::Parameterized` for a full example of the benefit.
9-
10-
*DHH*
11-
12-
* Allow lambdas to be used as lazy defaults in addition to procs.
13-
14-
*DHH*
15-
16-
* Mime type: allow to custom content type when setting body in headers
17-
and attachments.
18-
19-
Example:
20-
21-
def test_emails
22-
attachments["invoice.pdf"] = "This is test File content"
23-
mail(body: "Hello there", content_type: "text/html")
24-
end
25-
26-
*Minh Quy*
27-
28-
* Exception handling: use `rescue_from` to handle exceptions raised by
29-
mailer actions, by message delivery, and by deferred delivery jobs.
30-
31-
*Jeremy Daer*
32-
33-
Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.
1+
Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionmailer/CHANGELOG.md) for previous changes.

actionmailer/lib/action_mailer/gem_version.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ def self.gem_version
66

77
module VERSION
88
MAJOR = 5
9-
MINOR = 1
9+
MINOR = 2
1010
TINY = 0
11-
PRE = "beta1"
11+
PRE = "alpha"
1212

1313
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1414
end

0 commit comments

Comments
 (0)