Permalink
Browse files

Merge branch '5-0-0' into 5-0-stable

Conflicts:
	Gemfile.lock
	actioncable/package.json
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
  • Loading branch information...
eileencodes committed Jun 30, 2016
2 parents 954cdd6 + 48512d7 commit c4bdfc8f9f081c493df827942e3f107091f7d8fc
View
@@ -48,7 +48,8 @@ group :job do
gem 'sneakers', require: false
gem 'que', require: false
gem 'backburner', require: false
- gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
+ #TODO: add qu after it support Rails 5.1
+ # gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
gem 'qu-redis', require: false
gem 'delayed_job_active_record', require: false
gem 'sequel', require: false
View
@@ -6,19 +6,6 @@ GIT
queue_classic (3.2.0.RC1)
pg (>= 0.17, < 0.19)
-GIT
- remote: git://github.com/bkeepers/qu.git
- revision: d098e2657c92e89a6413bebd9c033930759c061f
- branch: master
- specs:
- qu (0.2.0)
- qu-rails (0.2.0)
- qu (= 0.2.0)
- railties (>= 3.2, < 5)
- qu-redis (0.2.0)
- qu (= 0.2.0)
- redis-namespace
-
GIT
remote: git://github.com/sass/sass.git
revision: 64c5c111c04feaa91428e7d03eb6d4284e6a2d64
@@ -29,58 +16,58 @@ GIT
PATH
remote: .
specs:
- actioncable (5.0.0.rc2)
- actionpack (= 5.0.0.rc2)
+ actioncable (5.0.0)
+ actionpack (= 5.0.0)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.0.rc2)
- actionpack (= 5.0.0.rc2)
- actionview (= 5.0.0.rc2)
- activejob (= 5.0.0.rc2)
+ actionmailer (5.0.0)
+ actionpack (= 5.0.0)
+ actionview (= 5.0.0)
+ activejob (= 5.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.0.rc2)
- actionview (= 5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ actionpack (5.0.0)
+ actionview (= 5.0.0)
+ activesupport (= 5.0.0)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ actionview (5.0.0)
+ activesupport (= 5.0.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ activejob (5.0.0)
+ activesupport (= 5.0.0)
globalid (>= 0.3.6)
- activemodel (5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
- activerecord (5.0.0.rc2)
- activemodel (= 5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ activemodel (5.0.0)
+ activesupport (= 5.0.0)
+ activerecord (5.0.0)
+ activemodel (= 5.0.0)
+ activesupport (= 5.0.0)
arel (~> 7.0)
- activesupport (5.0.0.rc2)
+ activesupport (5.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- rails (5.0.0.rc2)
- actioncable (= 5.0.0.rc2)
- actionmailer (= 5.0.0.rc2)
- actionpack (= 5.0.0.rc2)
- actionview (= 5.0.0.rc2)
- activejob (= 5.0.0.rc2)
- activemodel (= 5.0.0.rc2)
- activerecord (= 5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ rails (5.0.0)
+ actioncable (= 5.0.0)
+ actionmailer (= 5.0.0)
+ actionpack (= 5.0.0)
+ actionview (= 5.0.0)
+ activejob (= 5.0.0)
+ activemodel (= 5.0.0)
+ activerecord (= 5.0.0)
+ activesupport (= 5.0.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.0.rc2)
+ railties (= 5.0.0)
sprockets-rails (>= 2.0.0)
- railties (5.0.0.rc2)
- actionpack (= 5.0.0.rc2)
- activesupport (= 5.0.0.rc2)
+ railties (5.0.0)
+ actionpack (= 5.0.0)
+ activesupport (= 5.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -182,6 +169,12 @@ GEM
pkg-config (1.1.7)
psych (2.1.0)
puma (3.4.0)
+ qu (0.2.0)
+ multi_json
+ qu-redis (0.2.0)
+ qu (= 0.2.0)
+ redis-namespace
+ simple_uuid
que (0.11.5)
racc (1.4.14)
rack (2.0.1)
@@ -227,6 +220,7 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
sigdump (0.2.4)
+ simple_uuid (0.4.0)
sinatra (1.0)
rack (>= 1.0)
sneakers (2.3.5)
@@ -299,7 +293,6 @@ DEPENDENCIES
pg (>= 0.18.0)
psych (~> 2.0)
puma
- qu-rails!
qu-redis
que
queue_classic!
@@ -326,4 +319,4 @@ DEPENDENCIES
wdm (>= 0.1.0)
BUNDLED WITH
- 1.11.2
+ 1.12.5
View
@@ -1 +1 @@
-5.0.0.rc2
+5.0.0
View
@@ -1,19 +1,10 @@
-## Rails 5.0.0.rc2 (June 22, 2016) ##
+## Rails 5.0.0 (June 30, 2016) ##
+* Fix development reloading support: new cable connections are now correctly
+ dispatched to the reloaded channel class, instead of using a cached reference
+ to the originally-loaded version.
-* Fix development reloading support: new cable connections are now correctly
- dispatched to the reloaded channel class, instead of using a cached reference
- to the originally-loaded version.
-
- *Matthew Draper*
-
-
-## Rails 5.0.0.rc1 (May 06, 2016) ##
-
-* No changes.
-
-
-## Rails 5.0.0.beta4 (April 27, 2016) ##
+ *Matthew Draper*
* WebSocket protocol negotiation.
@@ -58,8 +49,6 @@
*Jay Hayes*
-## Rails 5.0.0.beta3 (February 24, 2016) ##
-
* Added `em_redis_connector` and `redis_connector` to
`ActionCable::SubscriptionAdapter::EventedRedis` and added `redis_connector`
to `ActionCable::SubscriptionAdapter::Redis`, so you can overwrite with your
@@ -68,8 +57,6 @@
*DHH*
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
* Support PostgreSQL pubsub adapter.
*Jon Moss*
@@ -91,8 +78,6 @@
*Jon Moss*
-## Rails 5.0.0.beta1 (December 18, 2015) ##
-
* Added to Rails!
*DHH*
@@ -8,7 +8,7 @@ module VERSION
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
View
@@ -1,6 +1,6 @@
{
"name": "actioncable",
- "version": "5.0.0-rc1",
+ "version": "5.0.0",
"description": "WebSocket framework for Ruby on Rails.",
"main": "lib/assets/compiled/action_cable.js",
"files": [
View
@@ -1,18 +1,10 @@
-## Rails 5.0.0.rc2 (June 22, 2016) ##
+## Rails 5.0.0 (June 30, 2016) ##
* Exception handling: use `rescue_from` to handle exceptions raised by
mailer actions, by message delivery, and by deferred delivery jobs.
*Jeremy Daer*
-
-## Rails 5.0.0.rc1 (May 06, 2016) ##
-
-* No changes.
-
-
-## Rails 5.0.0.beta4 (April 27, 2016) ##
-
* Disallow calling `#deliver_later` after making local modifications to
the message which would be lost when the delivery job is enqueued.
@@ -36,9 +28,6 @@
*Clayton Liggitt*
-
-## Rails 5.0.0.beta3 (February 24, 2016) ##
-
* Add support for fragment caching in Action Mailer views.
*Stan Lo*
@@ -48,14 +37,6 @@
*Yves Senn*
-
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
-* No changes.
-
-
-## Rails 5.0.0.beta1 (December 18, 2015) ##
-
* `config.action_mailer.default_url_options[:protocol]` is now set to `https` if `config.force_ssl` is set to `true`.
*Andrew Kampjes*
@@ -8,7 +8,7 @@ module VERSION
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
View
@@ -1,18 +1,10 @@
-## Rails 5.0.0.rc2 (June 22, 2016) ##
-
-* No changes.
-
-
-## Rails 5.0.0.rc1 (May 06, 2016) ##
+## Rails 5.0.0 (June 30, 2016) ##
* Add `ActionController#helpers` to get access to the view context at the controller
level.
*Rafael Mendonça França*
-
-## Rails 5.0.0.beta4 (April 27, 2016) ##
-
* Routing: Refactor `:action` default handling to ensure that path
parameters are not mutated during route generation.
@@ -109,8 +101,6 @@
*Godfrey Chan*, *Jon Moss*, *Kasper Timm Hansen*, *Mike Clark*, *Matthew Draper*
-## Rails 5.0.0.beta3 (February 24, 2016) ##
-
* Add "application/gzip" as a default mime type.
*Mehmet Emin İNAÇ*
@@ -166,8 +156,6 @@
*DHH*
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
* Add `-g` and `-c` options to `bin/rails routes`. These options return the url `name`, `verb` and
`path` field that match the pattern or match a specific controller.
@@ -221,8 +209,6 @@
*Justin Coyne*
-## Rails 5.0.0.beta1 (December 18, 2015) ##
-
* Deprecate `redirect_to :back` in favor of `redirect_back`, which accepts a
required `fallback_location` argument, thus eliminating the possibility of a
`RedirectBackError`.
@@ -8,7 +8,7 @@ module VERSION
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
View
@@ -1,4 +1,4 @@
-## Rails 5.0.0.rc2 (June 22, 2016) ##
+## Rails 5.0.0 (June 30, 2016) ##
* Change `datetime_field` and `datetime_field_tag` to generate `datetime-local` fields.
@@ -37,14 +37,6 @@
*Vipul A M *
-
-## Rails 5.0.0.rc1 (May 06, 2016) ##
-
-* No changes.
-
-
-## Rails 5.0.0.beta4 (April 27, 2016) ##
-
* `date_select` helper `:with_css_classes` option now accepts a hash of strings
for `:year`, `:month`, `:day`, `:hour`, `:minute`, `:second` that will extend
the select type with the given css class value.
@@ -71,8 +63,6 @@
*Vipul A M and Prem Sichanugrist*
-## Rails 5.0.0.beta3 (February 24, 2016) ##
-
* Collection rendering can cache and fetch multiple partials at once.
Collections rendered as:
@@ -102,8 +92,6 @@
*James Coleman*
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
* Fix stripping the digest from the automatically generated img tag alt
attribute when assets are handled by Sprockets >=3.0.
@@ -132,9 +120,6 @@
*Yuuji Yaginuma*
-
-## Rails 5.0.0.beta1 (December 18, 2015) ##
-
* `I18n.translate` helper will wrap the missing translation keys
in a <span> tag only if `debug_missing_translation` configuration
be true. Default value is `true`. For example in `application.rb`:
@@ -8,7 +8,7 @@ module VERSION
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
Oops, something went wrong.

0 comments on commit c4bdfc8

Please sign in to comment.