Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: andhapp/rails
...
head fork: andhapp/rails
Commits on Aug 02, 2012
@kennyj kennyj Improve error handling when using partial name with hyphen. Fix #7079 a8d68d8
@rafaelfranca rafaelfranca Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237

Conflicts:
	activerecord/CHANGELOG.md
4028bed
@rafaelfranca rafaelfranca Fix tests.
Since b6ab441 the single quotes are
being escaped in the templates.
d875247
@arthurpsmith arthurpsmith Fix for digest authentication bug - issue #2301 in rails/rails b3e2abc
@josevalim josevalim Merge pull request #7129 from kennyj/fix_7079
Improve error handling when using partial name with hyphen. #7079
ac1a5d4
@josevalim josevalim Check validity of options[:as] just once 7a7ec74
@fxn fxn defines a private require-hub active_support/rails
This is a private place to put those AS features that are used
by every component. Nowadays we cherry-pick individual files
wherever they are used, but that it is not worth the effort
for stuff that is going to be loaded for sure sooner or later,
like blank?, autoload, concern, etc.
1a7b2e8
@fxn fxn load active_support/core_ext/object/blank in active_support/rails 8f58d6e
@fxn fxn load active_support/core_ext/object/inclusion in active_support/rails 5ea6b0d
@fxn fxn load active_support/dependencies/autoload in active_support/rails 47396a9
@fxn fxn load active_support/concern in active_support/rails 64bc844
@fxn fxn load active_support/core_ext/class/attribute in active_support/rails 5e1b920
@fxn fxn load active_support/core_ext/module/delegation in active_support/rails 4aee8dd
@fxn fxn load active_support/deprecation in active_support/rails 077372b
@steveklabnik steveklabnik Changelog entry for Digest Auth fix (#2301) 6beaafd
@rafaelfranca rafaelfranca Merge pull request #7240 from steveklabnik/fix_2301
Fix for digest authentication bug - issue #2301 in rails/rails
6e52376
@rafaelfranca rafaelfranca Remove `:rails_env` task since it is not needed anymore. 9abf589
@armanddp armanddp Collapsed dual checks (one for content headers and one for content) i…
…nto a single check.

Rails includes a single character body to a head(:no_content) response to work around an old Safari bug where headers were ignored if no body sent.

This patch brings the behavior slightly closer to spec if :no_content/204 is explicity requested via a head only response.

Status comparison done on symbolic and numeric values

Not returning any content when responding with head and limited to a status code that explicitly states no content will be returned - 100..199, 204, 205, 304.
c62abed
Commits on Aug 03, 2012
@rafaelfranca rafaelfranca Merge pull request #7231 from armanddp/no_content
Remove single character body in head(:no_content) response
3c731a4
@tenderlove tenderlove make sure the body finishes rendering before checking response closure c391919
@jonleighton jonleighton Allow Relation#merge to take a proc.
This was requested by DHH to allow creating of one's own custom
association macros.

For example:

    module Commentable
      def has_many_comments(extra)
        has_many :comments, -> { where(:foo).merge(extra) }
      end
    end

    class Post < ActiveRecord::Base
      extend Commentable
      has_many_comments -> { where(:bar) }
    end
bf2df6e