aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile.lock68
-rw-r--r--RAILS_VERSION2
-rw-r--r--actioncable/CHANGELOG.md5
-rw-r--r--actioncable/lib/action_cable/gem_version.rb2
-rw-r--r--actionmailer/CHANGELOG.md5
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
-rw-r--r--actionpack/CHANGELOG.md7
-rw-r--r--actionpack/lib/action_pack/gem_version.rb2
-rw-r--r--actionview/CHANGELOG.md5
-rw-r--r--actionview/lib/action_view/gem_version.rb2
-rw-r--r--activejob/CHANGELOG.md5
-rw-r--r--activejob/lib/active_job/gem_version.rb2
-rw-r--r--activemodel/CHANGELOG.md5
-rw-r--r--activemodel/lib/active_model/gem_version.rb2
-rw-r--r--activerecord/CHANGELOG.md5
-rw-r--r--activerecord/lib/active_record/gem_version.rb2
-rw-r--r--activesupport/CHANGELOG.md5
-rw-r--r--activesupport/lib/active_support/gem_version.rb2
-rw-r--r--guides/CHANGELOG.md5
-rw-r--r--railties/CHANGELOG.md5
-rw-r--r--railties/lib/rails/gem_version.rb2
-rw-r--r--version.rb2
22 files changed, 96 insertions, 46 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ba41d0705f..bd2e2c30b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,60 +29,60 @@ GIT
PATH
remote: .
specs:
- actioncable (5.0.0.beta1.1)
- actionpack (= 5.0.0.beta1.1)
+ actioncable (5.0.0.beta2)
+ actionpack (= 5.0.0.beta2)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.0.beta1.1)
- actionpack (= 5.0.0.beta1.1)
- actionview (= 5.0.0.beta1.1)
- activejob (= 5.0.0.beta1.1)
+ actionmailer (5.0.0.beta2)
+ actionpack (= 5.0.0.beta2)
+ actionview (= 5.0.0.beta2)
+ activejob (= 5.0.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (5.0.0.beta1.1)
- actionview (= 5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ actionpack (5.0.0.beta2)
+ actionview (= 5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ actionview (5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ activejob (5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
globalid (>= 0.3.6)
- activemodel (5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
- activerecord (5.0.0.beta1.1)
- activemodel (= 5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ activemodel (5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
+ activerecord (5.0.0.beta2)
+ activemodel (= 5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
arel (~> 7.0)
- activesupport (5.0.0.beta1.1)
+ activesupport (5.0.0.beta2)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
tzinfo (~> 1.1)
- rails (5.0.0.beta1.1)
- actioncable (= 5.0.0.beta1.1)
- actionmailer (= 5.0.0.beta1.1)
- actionpack (= 5.0.0.beta1.1)
- actionview (= 5.0.0.beta1.1)
- activejob (= 5.0.0.beta1.1)
- activemodel (= 5.0.0.beta1.1)
- activerecord (= 5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ rails (5.0.0.beta2)
+ actioncable (= 5.0.0.beta2)
+ actionmailer (= 5.0.0.beta2)
+ actionpack (= 5.0.0.beta2)
+ actionview (= 5.0.0.beta2)
+ activejob (= 5.0.0.beta2)
+ activemodel (= 5.0.0.beta2)
+ activerecord (= 5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.0.beta1.1)
+ railties (= 5.0.0.beta2)
sprockets-rails (>= 2.0.0)
- railties (5.0.0.beta1.1)
- actionpack (= 5.0.0.beta1.1)
- activesupport (= 5.0.0.beta1.1)
+ railties (5.0.0.beta2)
+ actionpack (= 5.0.0.beta2)
+ activesupport (= 5.0.0.beta2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -164,7 +164,7 @@ GEM
mysql2 (0.4.2)
mysql2 (0.4.2-x64-mingw32)
mysql2 (0.4.2-x86-mingw32)
- nio4r (1.2.0)
+ nio4r (1.2.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7.2-x64-mingw32)
@@ -234,7 +234,7 @@ GEM
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.0.0)
+ sprockets-rails (3.0.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
diff --git a/RAILS_VERSION b/RAILS_VERSION
index 8422265fdd..60b8d0bf66 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-5.0.0.beta1.1
+5.0.0.beta2
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index a33b7b6b4b..5c968a48fc 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Create notion of an `ActionCable::SubscriptionAdapter`.
Separate out Redis functionality into
`ActionCable::SubscriptionAdapter::Redis`, and add a
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
index c652fb91ae..a71603e61a 100644
--- a/actioncable/lib/action_cable/gem_version.rb
+++ b/actioncable/lib/action_cable/gem_version.rb
@@ -8,7 +8,7 @@ module ActionCable
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index e74e0bc20a..22e9bd12a1 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* `config.force_ssl = true` will set
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index d28568b6a1..a1ee5fb238 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -8,7 +8,7 @@ module ActionMailer
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b2d9288eca..2aa78d20c0 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Add `-g` and `-c` (short for _grep_ and _controller_ respectively) options
to `bin/rake routes`. These options return the url `name`, `verb` and
`path` field that match the pattern or match a specific controller.
@@ -7,7 +12,7 @@
See #18902.
*Anton Davydov* & *Vipul A M*
-
+
* Response etags to always be weak: Prefixes 'W/' to value returned by
`ActionDispatch::Http::Cache::Response#etag=`, such that etags set in
`fresh_when` and `stale?` are weak.
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
index 3a1410d492..778c5482d3 100644
--- a/actionpack/lib/action_pack/gem_version.rb
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -8,7 +8,7 @@ module ActionPack
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index d85681e0d1..630a6b1b04 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Fix stripping the digest from the automatically generated img tag alt
attribute when assets are handled by Sprockets >=3.0.
diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
index 23d5319579..bb5c96cb39 100644
--- a/actionview/lib/action_view/gem_version.rb
+++ b/actionview/lib/action_view/gem_version.rb
@@ -8,7 +8,7 @@ module ActionView
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 8687af5eba..981b6a20ec 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* Fixed serializing `:at` option for `assert_enqueued_with`
diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
index 0bdeca76a8..bc88221027 100644
--- a/activejob/lib/active_job/gem_version.rb
+++ b/activejob/lib/active_job/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveJob
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index e4769d2f40..318e507ff1 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* Validate multiple contexts on `valid?` and `invalid?` at once.
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
index 4563f860c3..94514a0657 100644
--- a/activemodel/lib/active_model/gem_version.rb
+++ b/activemodel/lib/active_model/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveModel
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 50a0b291b3..63a7dd4968 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* `ActiveRecord::Relation#reverse_order` throws `ActiveRecord::IrreversibleOrderError`
when the order can not be reversed using current trivial algorithm.
Also raises the same error when `#reverse_order` is called on
diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
index b4f2f66e1c..aa1f5c4fb4 100644
--- a/activerecord/lib/active_record/gem_version.rb
+++ b/activerecord/lib/active_record/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveRecord
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 8cff374a47..d20617a194 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Change number_to_currency behavior for checking negativity.
Used `to_f.negative` instead of using `to_f.phase` for checking negativity
diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
index 3104d0e00f..fc08273b6d 100644
--- a/activesupport/lib/active_support/gem_version.rb
+++ b/activesupport/lib/active_support/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveSupport
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index aae405d5ac..d58016053b 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* Add code of conduct to contributing guide
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f94bb49135..e98180d126 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Add `after_bundle` callbacks in Rails plugin templates. Useful for allowing
templates to perform actions that are dependent upon `bundle install`.
diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
index f4d5b660dc..93e0151602 100644
--- a/railties/lib/rails/gem_version.rb
+++ b/railties/lib/rails/gem_version.rb
@@ -8,7 +8,7 @@ module Rails
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/version.rb b/version.rb
index f4d5b660dc..93e0151602 100644
--- a/version.rb
+++ b/version.rb
@@ -8,7 +8,7 @@ module Rails
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 20:26:16 +0000