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: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 15, 2013
@senny senny Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…
…yed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb

Conflicts:
	activerecord/CHANGELOG.md
1c2545a
@rafaelfranca rafaelfranca Use Ruby 1.8 syntax 66cba60
Commits on Jul 17, 2013
@arunagw arunagw Removed unused test file
This test file is not be running from a long time
This test is already covered in controller/caching_test.rb
fc0faaa
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11468 from arunagw/removed_unsed_test
Removed unused test file
ac5cc69
Commits on Jul 18, 2013
@wolframarnold wolframarnold Add respond_to_missing? for TaggedLogging which is needed if another …
…log abstracter wraps a TaggedLogging instance.

It's also best practice when overriding method_missing.
803008e
@907th 907th Fix `assert_redirected_to` does not show user-supplied message.
Issue: when `assert_redirected_to` fails due to the response redirect not
matching the expected redirect the user-supplied message (second parameter)
is not shown. This message is only shown if the response is not a redirect.
0f5ba6e
@rafaelfranca rafaelfranca Merge pull request #10800 from 907th/fix-custom-message-for-assert_re…
…directed_to

Fix #10842. `assert_redirected_to` does not show user-supplied message.
39441f7
@rafaelfranca rafaelfranca Merge pull request #11486 from wolframarnold/3-2-stable_fix_respond_t…
…o_missing_in_tagged_loggging

3-2-stable patch: Add respond_to_missing? in TaggedLoggging
ed19c02
Commits on Jul 21, 2013
@pixeltrix pixeltrix Add test to prevent route reloading regression
Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
d835307
Commits on Jul 22, 2013
@rafaelfranca rafaelfranca Fix activemodel CHANGELOG c69ccea
@rafaelfranca rafaelfranca Merge branch '3-2-14' into 3-2-stable 2b3ce86
@rafaelfranca rafaelfranca Fix actionpack CHANGELOG entry
It was included by git on the wrong release
e0db277
Commits on Jul 23, 2013
@90yukke 90yukke Fix merge error when Equality LHS is non-attribute.
This is reworking of rails/rails#7380 made for rails 3.
b289519
@rafaelfranca rafaelfranca Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attri…
…bute-equalities

Fix merge error when Equality LHS is non-attribute.
c4b93f5
Commits on Jul 24, 2013
@alfredw alfredw Specified column type for quote_value
When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.

I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.

This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.

I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
33e1604
@Empact Empact Tidy up the "Specified column type for quote_value" changes
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
b4dea61
@rafaelfranca rafaelfranca Fix broken test
quote_value is called on the object not the class
1463fbe
Commits on Jul 31, 2013
@rafaelfranca rafaelfranca Move changelog entry to the top [ci skip] 773eca0
Commits on Aug 05, 2013
@kassio kassio Load fixtures from linked folders 0ec701d
@rafaelfranca rafaelfranca Merge pull request #11765 from kassio/load-fixtures-from-linked-folder
Load fixtures from linked folder
5f8a7d1
@siong1987 siong1987 Make `rake doc:guides` works again. Fix #10384.
Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
946ad5d
Commits on Aug 18, 2013
Eugene Kalenkovich Fix test incompatible with 1.8.7 93f1a72
@guilleiguaran guilleiguaran Merge pull request #11930 from UncleGene/ties_test
Fix test incompatible with 1.8.7
6d9050b
Eugene Kalenkovich Fix 1.8.7 incompatible respond_to_missing adf6e30
Commits on Aug 24, 2013
@kassio kassio fix issue #11605 424a5a7
Commits on Aug 26, 2013
@rafaelfranca rafaelfranca Merge pull request #12006 from kassio/11605-render-with-context-format
Render with context format
e0fc5da
Commits on Aug 27, 2013
@tenderlove tenderlove Merge pull request #12048 from tjouan/app_generator-bin_perms-umask
Comply with current umask when generating new app
Conflicts:
	railties/lib/rails/generators/rails/app/app_generator.rb
59a3561
Commits on Aug 30, 2013
@Ben-M Ben-M Fix STI scopes using benolee's suggestion. Fixes #11939 cf1904f
Commits on Sep 06, 2013
@beedub beedub pass the extra params to the rack test environment so that routes wit…
…h block constraints have access
03ac291
Commits on Sep 09, 2013
@arthurnn arthurnn on SchemaCache use the connection getter instead of the obj given f0301e3
Commits on Sep 10, 2013
@spastorino spastorino Merge pull request #12176 from arthurnn/ar32_schema_cache
on SchemaCache use the connection getter instead of the obj given
143e009
@steveklabnik steveklabnik Merge pull request #9368 from CrowdFlower/3-2-stable
PR #5219 backported to 3-2
cff8d1d
Commits on Sep 12, 2013
Eugene Kalenkovich Fix FinderMethods#last unscoped primary key
Fixes table.joins(:relation).last(N) breaking on sqlite

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
c9642e3
@rafaelfranca rafaelfranca Merge pull request #12196 from h-lame/fix-activesupport-cache-filesto…
…re-cleanup

Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
c539c68
Commits on Sep 25, 2013
@rafaelfranca rafaelfranca Merge pull request #12359 from arthurnn/inverse_on_callbacks
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/company.rb
fdc3c08
@arthurnn arthurnn on tests: dont always touch firm on validate e1bb9fc
Commits on Sep 26, 2013
@rafaelfranca rafaelfranca Merge pull request #12364 from arthurnn/test_fix_validate
Fix query counters when testing with IdentityMap on 3.2
e82ceca
@arthurnn arthurnn fix inverse_of when find_or_initialize_by_*
inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
found on the db.
fed6ac9
Commits on Sep 28, 2013
@rafaelfranca rafaelfranca Use Ruby 1.8 hash syntax 50a9644
Commits on Sep 29, 2013
@rafaelfranca rafaelfranca Merge pull request #12375 from arthurnn/inverse_after_find_or_initialize
Inverse after find or initialize
54c05ac
Commits on Sep 30, 2013
@arthurnn arthurnn Move set_inverse_instance to association.build_record
[fixes #10371]
6798604
@rafaelfranca rafaelfranca Merge pull request #12413 from arthurnn/inverse_of_on_build
Inverse of on build
ccd11d5
@NZKoz NZKoz Remove the use of String#% when formatting durations in log messages
This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
5aee516
Commits on Oct 01, 2013
Tamir Duberstein make sure both headers are set before checking for ip spoofing 85106de
@pixeltrix pixeltrix Merge pull request #12410 from tamird/fix-ip-spoof-errors
Fix ip spoof errors
83c4b0a
Commits on Oct 03, 2013
@tenderlove tenderlove Merge branch '3-2-stable' into 3-2-sec
* 3-2-stable:
  make sure both headers are set before checking for ip spoofing
  Move set_inverse_instance to association.build_record
befeeb2
@tenderlove tenderlove Merge pull request #12084 from Ben-M/3-2-stable
Fix STI scopes using benolee's suggestion. Fixes #11939
31c79e2
@tenderlove tenderlove bumping version to 3.2.15.rc1 5e277c8
Commits on Oct 04, 2013
@rafaelfranca rafaelfranca Merge pull request #12443 from arthurnn/add_inverse_of_add_target
Add inverse of add target
73dff26
@tenderlove tenderlove bumping to rc2 5ede19b
Commits on Oct 10, 2013
@rafaelfranca rafaelfranca Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_ta…
…rget"

This reverts commit 7ed5bdc, reversing
changes made to 31c79e2.

Reason: this caused a regression when the associated record is creted in
a before_create callback.

See #12413 (comment)
fbc69ac
@rafaelfranca rafaelfranca Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
This reverts commit ccd11d5, reversing
changes made to 54c05ac.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
#12413 (comment)
38aefa5
Commits on Oct 11, 2013
@tenderlove tenderlove bumping to rc3 e3abd78
Commits on Oct 15, 2013
@tenderlove tenderlove Merge branch '3-2-15' into 3-2-sec
* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939
eb8807e
@tenderlove tenderlove bumping to 3.2.15 2a0c440
Commits on Oct 16, 2013
@tenderlove tenderlove updating changelogs 538f8ba
Something went wrong with that request. Please try again.