Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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

Fix for get_ids when including a belongs_to association on a has_many association [#2896 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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>

Reorganized initializers a bit to enable better hooks for common cases without the need for Railtie. Specifically, the following hooks were added:

* before_configuration: this hook is run immediately after the Application class 
  comes into existence, but before the user has added any configuration. This is
  the appropriate place to set configuration for your plugin
* before_initialize: This is run after all of the user's configuration has completed,
  but before any initializers have begun (in other words, it runs right after
  config/environments/{development,production,test}.rb)
* after_initialize: This is run after all of the initializers have run. It is an
  appropriate place for forking in a preforking setup

Each of these hooks may be used via ActiveSupport.on_load(name) { }. In all these cases, the context inside the block will be the Application object. This means that for simple cases, you can use these hooks without needing to create a Railtie.

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

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

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

Bundler deprecated options in Gemfile with application template using method "gem" [#4534 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

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

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

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

and added AR::Base::clear_default_scope

- clear_default_scope provides users who rely on the old behaviour
  of each call to default_scope overwriting any previous default
  scopes an opportunity to maintain that behaviour.

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

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

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

Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

defines prev_(month|year) in Date and Time to ease transition to 1.9, and deprecates last_(month|year)

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

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

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

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

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

type_cast_calculated_value refactor: value is never a Fixnum here. Fix test since SQLite returns Float.

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

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

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

This reverts commit 6626833d.