Skip to content

Commit

Permalink
Start Rails 5.2 development
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewd committed Mar 21, 2017
1 parent 88b1684 commit 6c08d48
Show file tree
Hide file tree
Showing 34 changed files with 90 additions and 2,447 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -7,6 +7,8 @@ end

gemspec

gem "arel", github: "rails/arel"

# We need a newish Rake since Active Job sets its test tasks' descriptions.
gem "rake", ">= 11.1"

Expand Down
76 changes: 41 additions & 35 deletions Gemfile.lock
Expand Up @@ -23,61 +23,67 @@ GIT
event_emitter
websocket

GIT
remote: https://github.com/rails/arel.git
revision: 437aa3a4bb8ad4f3f4eba299dbb1112852f9c7ac
specs:
arel (8.0.0)

PATH
remote: .
specs:
actioncable (5.1.0.beta1)
actionpack (= 5.1.0.beta1)
actioncable (5.2.0.alpha)
actionpack (= 5.2.0.alpha)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.0.beta1)
actionpack (= 5.1.0.beta1)
actionview (= 5.1.0.beta1)
activejob (= 5.1.0.beta1)
actionmailer (5.2.0.alpha)
actionpack (= 5.2.0.alpha)
actionview (= 5.2.0.alpha)
activejob (= 5.2.0.alpha)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.0.beta1)
actionview (= 5.1.0.beta1)
activesupport (= 5.1.0.beta1)
actionpack (5.2.0.alpha)
actionview (= 5.2.0.alpha)
activesupport (= 5.2.0.alpha)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.0.beta1)
activesupport (= 5.1.0.beta1)
actionview (5.2.0.alpha)
activesupport (= 5.2.0.alpha)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.0.beta1)
activesupport (= 5.1.0.beta1)
activejob (5.2.0.alpha)
activesupport (= 5.2.0.alpha)
globalid (>= 0.3.6)
activemodel (5.1.0.beta1)
activesupport (= 5.1.0.beta1)
activerecord (5.1.0.beta1)
activemodel (= 5.1.0.beta1)
activesupport (= 5.1.0.beta1)
activemodel (5.2.0.alpha)
activesupport (= 5.2.0.alpha)
activerecord (5.2.0.alpha)
activemodel (= 5.2.0.alpha)
activesupport (= 5.2.0.alpha)
arel (~> 8.0)
activesupport (5.1.0.beta1)
activesupport (5.2.0.alpha)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
rails (5.1.0.beta1)
actioncable (= 5.1.0.beta1)
actionmailer (= 5.1.0.beta1)
actionpack (= 5.1.0.beta1)
actionview (= 5.1.0.beta1)
activejob (= 5.1.0.beta1)
activemodel (= 5.1.0.beta1)
activerecord (= 5.1.0.beta1)
activesupport (= 5.1.0.beta1)
rails (5.2.0.alpha)
actioncable (= 5.2.0.alpha)
actionmailer (= 5.2.0.alpha)
actionpack (= 5.2.0.alpha)
actionview (= 5.2.0.alpha)
activejob (= 5.2.0.alpha)
activemodel (= 5.2.0.alpha)
activerecord (= 5.2.0.alpha)
activesupport (= 5.2.0.alpha)
bundler (>= 1.3.0, < 2.0)
railties (= 5.1.0.beta1)
railties (= 5.2.0.alpha)
sprockets-rails (>= 2.0.0)
railties (5.1.0.beta1)
actionpack (= 5.1.0.beta1)
activesupport (= 5.1.0.beta1)
railties (5.2.0.alpha)
actionpack (= 5.2.0.alpha)
activesupport (= 5.2.0.alpha)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand All @@ -88,7 +94,6 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
amq-protocol (2.1.0)
arel (8.0.0)
ast (2.3.0)
backburner (1.3.1)
beaneater (~> 1.0)
Expand Down Expand Up @@ -159,7 +164,7 @@ GEM
http_parser.rb (>= 0.6.0)
em-socksify (0.3.1)
eventmachine (>= 1.0.0.beta.4)
erubi (1.4.0)
erubi (1.6.0)
erubis (2.7.0)
event_emitter (0.2.5)
eventmachine (1.2.1)
Expand Down Expand Up @@ -371,6 +376,7 @@ DEPENDENCIES
activerecord-jdbcmysql-adapter (>= 1.3.0)
activerecord-jdbcpostgresql-adapter (>= 1.3.0)
activerecord-jdbcsqlite3-adapter (>= 1.3.0)
arel!
backburner
bcrypt (~> 3.1.11)
benchmark-ips
Expand Down Expand Up @@ -427,4 +433,4 @@ DEPENDENCIES
websocket-client-simple!

BUNDLED WITH
1.14.4
1.14.5
2 changes: 1 addition & 1 deletion RAILS_VERSION
@@ -1 +1 @@
5.1.0.beta1
5.2.0.alpha
46 changes: 1 addition & 45 deletions actioncable/CHANGELOG.md
@@ -1,45 +1 @@
## Rails 5.1.0.beta1 (February 23, 2017) ##

* Redis subscription adapters now support `channel_prefix` option in `cable.yml`

Avoids channel name collisions when multiple apps use the same Redis server.

*Chad Ingram*

* Permit same-origin connections by default.

Added new option `config.action_cable.allow_same_origin_as_host = false`
to disable this behaviour.

*Dávid Halász*, *Matthew Draper*

* Prevent race where the client could receive and act upon a
subscription confirmation before the channel's `subscribed` method
completed.

Fixes #25381.

*Vladimir Dementyev*

* Buffer now writes to WebSocket connections, to avoid blocking threads
that could be doing more useful things.

*Matthew Draper*, *Tinco Andringa*

* Protect against concurrent writes to a WebSocket connection from
multiple threads; the underlying OS write is not always threadsafe.

*Tinco Andringa*

* Add `ActiveSupport::Notifications` hook to `Broadcaster#broadcast`.

*Matthew Wear*

* Close hijacked socket when connection is shut down.

Fixes #25613.

*Tinco Andringa*


Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.
Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actioncable/CHANGELOG.md) for previous changes.
4 changes: 2 additions & 2 deletions actioncable/lib/action_cable/gem_version.rb
Expand Up @@ -6,9 +6,9 @@ def self.gem_version

module VERSION
MAJOR = 5
MINOR = 1
MINOR = 2
TINY = 0
PRE = "beta1"
PRE = "alpha"

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
Expand Down
2 changes: 1 addition & 1 deletion actioncable/package.json
@@ -1,6 +1,6 @@
{
"name": "actioncable",
"version": "5.1.0-beta1",
"version": "5.2.0-alpha",
"description": "WebSocket framework for Ruby on Rails.",
"main": "lib/assets/compiled/action_cable.js",
"files": [
Expand Down
34 changes: 1 addition & 33 deletions actionmailer/CHANGELOG.md
@@ -1,33 +1 @@
## Rails 5.1.0.beta1 (February 23, 2017) ##

* Add `:args` to `process.action_mailer` event.

*Yuji Yaginuma*

* Add parameterized invocation of mailers as a way to share before filters and defaults between actions.
See `ActionMailer::Parameterized` for a full example of the benefit.

*DHH*

* Allow lambdas to be used as lazy defaults in addition to procs.

*DHH*

* Mime type: allow to custom content type when setting body in headers
and attachments.

Example:

def test_emails
attachments["invoice.pdf"] = "This is test File content"
mail(body: "Hello there", content_type: "text/html")
end

*Minh Quy*

* Exception handling: use `rescue_from` to handle exceptions raised by
mailer actions, by message delivery, and by deferred delivery jobs.

*Jeremy Daer*

Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.
Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionmailer/CHANGELOG.md) for previous changes.
4 changes: 2 additions & 2 deletions actionmailer/lib/action_mailer/gem_version.rb
Expand Up @@ -6,9 +6,9 @@ def self.gem_version

module VERSION
MAJOR = 5
MINOR = 1
MINOR = 2
TINY = 0
PRE = "beta1"
PRE = "alpha"

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

1 comment on commit 6c08d48

@kaspth
Copy link
Contributor

@kaspth kaspth commented on 6c08d48 Mar 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

Please sign in to comment.