Permalink
Browse files

Merge branch '4-1-10' into 4-1-stable

  • Loading branch information...
rafaelfranca committed Mar 19, 2015
2 parents 836d1fd + 5496ec8 commit 26b6fc6bb62031f086439b4ba5b4930e4dc2e2e2
View
@@ -1,45 +1,45 @@
PATH
remote: .
specs:
actionmailer (4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
actionmailer (4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.9)
actionview (= 4.1.9)
activesupport (= 4.1.9)
actionpack (4.1.10)
actionview (= 4.1.10)
activesupport (= 4.1.10)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.9)
activesupport (= 4.1.9)
actionview (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.9)
activesupport (= 4.1.9)
activemodel (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
activerecord (4.1.9)
activemodel (= 4.1.9)
activesupport (= 4.1.9)
activerecord (4.1.10)
activemodel (= 4.1.10)
activesupport (= 4.1.10)
arel (~> 5.0.0)
activesupport (4.1.9)
activesupport (4.1.10)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
rails (4.1.9)
actionmailer (= 4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
activemodel (= 4.1.9)
activerecord (= 4.1.9)
activesupport (= 4.1.9)
rails (4.1.10)
actionmailer (= 4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
activemodel (= 4.1.10)
activerecord (= 4.1.10)
activesupport (= 4.1.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.9)
railties (= 4.1.10)
sprockets-rails (~> 2.0)
railties (4.1.9)
actionpack (= 4.1.9)
activesupport (= 4.1.9)
railties (4.1.10)
actionpack (= 4.1.10)
activesupport (= 4.1.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -77,7 +77,7 @@ GEM
minitest (5.3.3)
mocha (0.14.0)
metaclass (~> 0.0.1)
multi_json (1.10.1)
multi_json (1.11.0)
mustache (0.99.8)
mysql (2.9.1)
mysql2 (0.3.18)
@@ -108,7 +108,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
thor (0.19.1)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
turbolinks (2.5.3)
coffee-rails
View
@@ -1 +1 @@
4.1.9
4.1.10
@@ -1,3 +1,8 @@
## Rails 4.1.10 (March 19, 2015) ##
* No changes.
## Rails 4.1.9 (January 6, 2015) ##
* No changes.
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -5,6 +5,9 @@
*Jeremy Kemper*, *Yves Senn*
## Rails 4.1.10 (March 19, 2015) ##
* Preserve default format when generating URLs
Fixes an issue that would cause the format set in default_url_options to be
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -5,6 +5,9 @@
*Yves Senn*
## Rails 4.1.10 (March 19, 2015) ##
* Local variable in a partial is now available even if a falsy value is
passed to `:object` when rendering a partial.
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -1,3 +1,8 @@
## Rails 4.1.10 (March 19, 2015) ##
* No changes.
## Rails 4.1.9 (January 6, 2015) ##
* No changes.
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
@@ -1,3 +1,5 @@
## Rails 4.1.10 (March 19, 2015) ##
* Fixed ActiveRecord::Relation#becomes! and changed_attributes issues for type column
Fixes #17139.
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
@@ -1,3 +1,5 @@
## Rails 4.1.10 (March 19, 2015) ##
* Fixed a roundtrip problem with AS::SafeBuffer where primitive-like strings
will be dumped as primitives:
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -1,3 +1,8 @@
## Rails 4.1.10 (March 19, 2015) ##
* No changes.
## Rails 4.1.9 (January 6, 2015) ##
* No changes.
View
@@ -1,3 +1,5 @@
## Rails 4.1.10 (March 19, 2015) ##
* Add a new-line to the end of route method generated code.
We need to add a `\n`, because we cannot have two routes
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 1
TINY = 9
TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

0 comments on commit 26b6fc6

Please sign in to comment.