aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add back set_inverse_instance on .add_to_targetArthur Neves2013-10-041-0/+1
| | | | | We must have it in there too, so when an existent record is being concat to another, we will have the inverse relation.
* Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-033-1/+11
|\ | | | | Fix STI scopes using benolee's suggestion. Fixes #11939
| * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-303-1/+11
| |
* | Merge pull request #12410 from tamird/fix-ip-spoof-errorsAndrew White2013-10-013-1/+19
|\ \ | | | | | | Fix ip spoof errors
| * | make sure both headers are set before checking for ip spoofingTamir Duberstein2013-10-013-1/+19
|/ /
* | Merge pull request #12413 from arthurnn/inverse_of_on_buildRafael Mendonça França2013-09-304-2/+10
|\ \ | | | | | | Inverse of on build
| * | Move set_inverse_instance to association.build_recordArthur Neves2013-09-304-2/+10
|/ / | | | | | | [fixes #10371]
* | Merge pull request #12375 from arthurnn/inverse_after_find_or_initializeRafael Mendonça França2013-09-283-4/+22
|\ \ | | | | | | Inverse after find or initialize
| * | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-263-4/+22
| | | | | | | | | | | | | | | inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was found on the db.
* | | Use Ruby 1.8 hash syntaxRafael Mendonça França2013-09-281-2/+2
|/ /
* | Merge pull request #12364 from arthurnn/test_fix_validateRafael Mendonça França2013-09-252-2/+5
|\ \ | | | | | | Fix query counters when testing with IdentityMap on 3.2
| * | on tests: dont always touch firm on validateArthur Neves2013-09-252-2/+5
|/ /
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-1/+18
| | | | | | | | | | | | | | Make sure inverse_of is visible on the has_many callbacks Conflicts: activerecord/CHANGELOG.md activerecord/test/models/company.rb
* | Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanupRafael Mendonça França2013-09-123-1/+18
| | | | | | | | | | | | | | Fix FileStore#cleanup to no longer rely on missing each_key method Conflicts: activesupport/CHANGELOG.md activesupport/test/caching_test.rb
* | Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-124-3/+21
| | | | | | | | | | | | | | | | Fixes table.joins(:relation).last(N) breaking on sqlite Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb
* | Merge pull request #9368 from CrowdFlower/3-2-stableSteve Klabnik2013-09-104-4/+25
|\ \ | | | | | | PR #5219 backported to 3-2
| * | pass the extra params to the rack test environment so that routes with block ↵Brian Hahn2013-09-064-4/+25
| |/ | | | | | | constraints have access
* | Merge pull request #12176 from arthurnn/ar32_schema_cacheSantiago Pastorino2013-09-101-2/+2
|\ \ | |/ |/| on SchemaCache use the connection getter instead of the obj given
| * on SchemaCache use the connection getter instead of the obj givenArthur Neves2013-09-091-2/+2
|/
* Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
| | | | | | Comply with current umask when generating new app Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb
* Merge pull request #12006 from kassio/11605-render-with-context-formatRafael Mendonça França2013-08-2512-31/+16
|\ | | | | Render with context format
| * fix issue #11605Kassio Borges2013-08-2412-31/+16
|/
* Fix 1.8.7 incompatible respond_to_missingEugene Kalenkovich2013-08-181-2/+8
|
* Merge pull request #11930 from UncleGene/ties_testGuillermo Iguaran2013-08-181-4/+4
|\ | | | | Fix test incompatible with 1.8.7
| * Fix test incompatible with 1.8.7Eugene Kalenkovich2013-08-181-4/+4
|/
* Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-08-052-3/+3
| | | | | | Conflicts: railties/guides/rails_guides.rb railties/lib/rails/tasks/documentation.rake
* Merge pull request #11765 from kassio/load-fixtures-from-linked-folderRafael Mendonça França2013-08-054-3/+8
|\ | | | | Load fixtures from linked folder
| * Load fixtures from linked foldersKassio Borges2013-08-054-3/+8
|/
* Move changelog entry to the top [ci skip]Rafael Mendonça França2013-07-301-5/+8
|
* Fix broken testRafael Mendonça França2013-07-241-1/+1
| | | | quote_value is called on the object not the class
* Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-242-3/+3
| | | | | | | | | | 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
* Specified column type for quote_valueAlfred Wong2013-07-243-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge pull request #11563 from ↵Rafael Mendonça França2013-07-233-2/+23
|\ | | | | | | | | 90yukke/fix-nomethoderror-on-non-attribute-equalities Fix merge error when Equality LHS is non-attribute.
| * Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
|/ | | | This is reworking of rails/rails/pull/7380 made for rails 3.
* Fix actionpack CHANGELOG entryRafael Mendonça França2013-07-221-1/+4
| | | | It was included by git on the wrong release
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-2216-16/+24
|\
| * Fix activemodel CHANGELOGRafael Mendonça França2013-07-221-6/+1
| |
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-229-9/+9
| |
| * Update CHANGELOG entryRafael Mendonça França2013-07-226-34/+6
| |
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-1616-17/+47
| |
| * Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
| |
| * Merge pull request #11451 from ↵Yves Senn2013-07-153-0/+18
| | | | | | | | | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object Conflicts: activerecord/lib/active_record/autosave_association.rb
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-1216-24/+26
| |
* | Add test to prevent route reloading regressionAndrew White2013-07-211-0/+45
| | | | | | | | | | | | | | 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.
* | Merge pull request #11486 from ↵Rafael Mendonça França2013-07-183-0/+12
|\ \ | | | | | | | | | | | | wolframarnold/3-2-stable_fix_respond_to_missing_in_tagged_loggging 3-2-stable patch: Add respond_to_missing? in TaggedLoggging
| * | Add respond_to_missing? for TaggedLogging which is needed if another log ↵Wolfram Arnold2013-07-173-0/+12
| | | | | | | | | | | | | | | | | | abstracter wraps a TaggedLogging instance. It's also best practice when overriding method_missing.
* | | Merge pull request #10800 from 907th/fix-custom-message-for-assert_redirected_toRafael Mendonça França2013-07-173-2/+11
|\ \ \ | | | | | | | | Fix #10842. `assert_redirected_to` does not show user-supplied message.
| * | | Fix `assert_redirected_to` does not show user-supplied message.Alexey Chernenkov2013-07-183-2/+11
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #11468 from arunagw/removed_unsed_testCarlos Antonio da Silva2013-07-171-32/+0
|\| | | | | | | | Removed unused test file
| * | Removed unused test fileArun Agrawal2013-07-171-32/+0
|/ / | | | | | | This test file is not be running from a long time This test is already covered in controller/caching_test.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:01:15 +0000