Signed-off-by: NJosé Valim <jose.valim@gmail.com>

I've tested and confirm that `2-3-stable` will use the vendored `i18n` gem if there's no `i18n` gem with version >= 0.4.1 installed
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4942]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4942 state:committed]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4712 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Tidy up tests in previous commit since they did not assure an OrderedHash is returned (the test would pass for an array and would pass by chance for hashes).

[#4875 state:resolved]

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

This ensures that an OrderedHash's keys are set up appropriately when using update.

[#4973 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Make sure that Rails doesn't resent session_id cookie over and over again if it's already there [#2485 state:resolved]

This apply to only Active Record store and Memcached store, as they both store only the session_id, which will be unchanged, in the cookie.
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Fixes #2415 by creating a new instance of the Model when saving attributes to that model and the associated attributes already exist. Tests included. [#2415 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4827 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Fix eager loading of polymorphic has_one associations nested-included under polymorphic belongs_to associations. [#3233 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#1570 state:resovled]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Revert "make text_field and hidden_field omit the value attribute if the developer explicitly passes in :value => nil [#4839 state:reopened]"

This reverts commit 52c922fa

make text_field and hidden_field omit the value attribute if the developer explicitly passes in :value => nil [#4839 state:resolved]
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Conflicts:

	actionpack/lib/action_view/helpers/form_helper.rb

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

This will silent all warning if there's a i18n version 0.4.x gem install on user's machine.

[#4913 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Update bundled i18n gem to 0.4.1 to make sure every project will be warn about using deprecated %{..} interpolation.

This will also make sure that by changing {{..}} into %{..} won't break any Rails 2.3.x application, since it would load the vendored version if it's not satisfy the version requirement.
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

When not overwriting unsaved updates in nested attributes, allow already-saved records to be refreshed.
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4897]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#4689 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Make sure that rails recognized the full notation of IPv6 loopback address, and recognize 127.0.0.0/8 in IPv4

[#3257 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

deprecates Array#random_element in favor of Array#sample, backported from Ruby 1.9, thanks to Marc-Andre Lafortune

Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#896 state:committed]

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4633]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>