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

Maintain the usage of :as consistent in the router. Whenever it's supplied, it changes the NAMED ROUTE. If you want to change the PATH, use :path instead. Example: resources :projects, :path => 'projetos'

Signed-off-by: Nwycats <wycats@gmail.com>

Restore changed_attributes method in ActiveModel::Dirty and loosen expectation on including class' initialize method.

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

Slightly less annoying check for acceptable mime_types. This allows Accept: application/json, application/jsonp (and the like), but still blacklists browsers. Essentially, we use normal content negotiation unless you include */* in your list, in which case we assume you're a browser and send HTML [#3541 state:resolved]

Signed-off-by: Nwycats <wycats@gmail.com>

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

HTML safety: give a deprecation warning if an array of option tags is passed to select tag. Be sure to join the tag yourself and mark them .html_safe

Signed-off-by: NEmilio Tagua <miloops@gmail.com>

Signed-off-by: NEmilio Tagua <miloops@gmail.com>

NOTE: This does not fix the bundler activation issue. The "bundler"
gem will still be installed and activated when you install rails.

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

Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing signed cookies to work again.

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

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