Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add regression test for set_inverse_instance on add_to_target | Arthur Neves | 2013-10-04 | 1 | -0/+13 |
| | |||||
* | Add back set_inverse_instance on .add_to_target | Arthur Neves | 2013-10-04 | 1 | -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-stable | Aaron Patterson | 2013-10-03 | 3 | -1/+11 |
|\ | | | | | Fix STI scopes using benolee's suggestion. Fixes #11939 | ||||
| * | Fix STI scopes using benolee's suggestion. Fixes #11939 | Ben Maraney | 2013-08-30 | 3 | -1/+11 |
| | | |||||
* | | Merge pull request #12410 from tamird/fix-ip-spoof-errors | Andrew White | 2013-10-01 | 3 | -1/+19 |
|\ \ | | | | | | | Fix ip spoof errors | ||||
| * | | make sure both headers are set before checking for ip spoofing | Tamir Duberstein | 2013-10-01 | 3 | -1/+19 |
|/ / | |||||
* | | Merge pull request #12413 from arthurnn/inverse_of_on_build | Rafael Mendonça França | 2013-09-30 | 4 | -2/+10 |
|\ \ | | | | | | | Inverse of on build | ||||
| * | | Move set_inverse_instance to association.build_record | Arthur Neves | 2013-09-30 | 4 | -2/+10 |
|/ / | | | | | | | [fixes #10371] | ||||
* | | Merge pull request #12375 from arthurnn/inverse_after_find_or_initialize | Rafael Mendonça França | 2013-09-28 | 3 | -4/+22 |
|\ \ | | | | | | | Inverse after find or initialize | ||||
| * | | fix inverse_of when find_or_initialize_by_* | Arthur Neves | 2013-09-26 | 3 | -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 syntax | Rafael Mendonça França | 2013-09-28 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #12364 from arthurnn/test_fix_validate | Rafael Mendonça França | 2013-09-25 | 2 | -2/+5 |
|\ \ | | | | | | | Fix query counters when testing with IdentityMap on 3.2 | ||||
| * | | on tests: dont always touch firm on validate | Arthur Neves | 2013-09-25 | 2 | -2/+5 |
|/ / | |||||
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 4 | -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-cleanup | Rafael Mendonça França | 2013-09-12 | 3 | -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 key | Eugene Kalenkovich | 2013-09-12 | 4 | -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-stable | Steve Klabnik | 2013-09-10 | 4 | -4/+25 |
|\ \ | | | | | | | PR #5219 backported to 3-2 | ||||
| * | | pass the extra params to the rack test environment so that routes with block ↵ | Brian Hahn | 2013-09-06 | 4 | -4/+25 |
| |/ | | | | | | | constraints have access | ||||
* | | Merge pull request #12176 from arthurnn/ar32_schema_cache | Santiago Pastorino | 2013-09-10 | 1 | -2/+2 |
|\ \ | |/ |/| | on SchemaCache use the connection getter instead of the obj given | ||||
| * | on SchemaCache use the connection getter instead of the obj given | Arthur Neves | 2013-09-09 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #12048 from tjouan/app_generator-bin_perms-umask | Aaron Patterson | 2013-08-27 | 1 | -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-format | Rafael Mendonça França | 2013-08-25 | 12 | -31/+16 |
|\ | | | | | Render with context format | ||||
| * | fix issue #11605 | Kassio Borges | 2013-08-24 | 12 | -31/+16 |
|/ | |||||
* | Fix 1.8.7 incompatible respond_to_missing | Eugene Kalenkovich | 2013-08-18 | 1 | -2/+8 |
| | |||||
* | Merge pull request #11930 from UncleGene/ties_test | Guillermo Iguaran | 2013-08-18 | 1 | -4/+4 |
|\ | | | | | Fix test incompatible with 1.8.7 | ||||
| * | Fix test incompatible with 1.8.7 | Eugene Kalenkovich | 2013-08-18 | 1 | -4/+4 |
|/ | |||||
* | Make `rake doc:guides` works again. Fix #10384. | Teng Siong Ong | 2013-08-05 | 2 | -3/+3 |
| | | | | | | Conflicts: railties/guides/rails_guides.rb railties/lib/rails/tasks/documentation.rake | ||||
* | Merge pull request #11765 from kassio/load-fixtures-from-linked-folder | Rafael Mendonça França | 2013-08-05 | 4 | -3/+8 |
|\ | | | | | Load fixtures from linked folder | ||||
| * | Load fixtures from linked folders | Kassio Borges | 2013-08-05 | 4 | -3/+8 |
|/ | |||||
* | Move changelog entry to the top [ci skip] | Rafael Mendonça França | 2013-07-30 | 1 | -5/+8 |
| | |||||
* | Fix broken test | Rafael Mendonça França | 2013-07-24 | 1 | -1/+1 |
| | | | | quote_value is called on the object not the class | ||||
* | Tidy up the "Specified column type for quote_value" changes | Ben Woosley | 2013-07-24 | 2 | -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_value | Alfred Wong | 2013-07-24 | 3 | -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ça | 2013-07-23 | 3 | -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. | 90yukke | 2013-07-23 | 3 | -2/+23 |
|/ | | | | This is reworking of rails/rails/pull/7380 made for rails 3. | ||||
* | Fix actionpack CHANGELOG entry | Rafael Mendonça França | 2013-07-22 | 1 | -1/+4 |
| | | | | It was included by git on the wrong release | ||||
* | Merge branch '3-2-14' into 3-2-stable | Rafael Mendonça França | 2013-07-22 | 16 | -16/+24 |
|\ | |||||
| * | Fix activemodel CHANGELOG | Rafael Mendonça França | 2013-07-22 | 1 | -6/+1 |
| | | |||||
| * | Preparing for 3.2.14 release | Rafael Mendonça França | 2013-07-22 | 9 | -9/+9 |
| | | |||||
| * | Update CHANGELOG entry | Rafael Mendonça França | 2013-07-22 | 6 | -34/+6 |
| | | |||||
| * | Preparing for 3.2.14.rc2 release | Rafael Mendonça França | 2013-07-16 | 16 | -17/+47 |
| | | |||||
| * | Use Ruby 1.8 syntax | Rafael Mendonça França | 2013-07-15 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #11451 from ↵ | Yves Senn | 2013-07-15 | 3 | -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 release | Rafael Mendonça França | 2013-07-12 | 16 | -24/+26 |
| | | |||||
* | | Add test to prevent route reloading regression | Andrew White | 2013-07-21 | 1 | -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ça | 2013-07-18 | 3 | -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 Arnold | 2013-07-17 | 3 | -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_to | Rafael Mendonça França | 2013-07-17 | 3 | -2/+11 |
|\ \ \ | | | | | | | | | Fix #10842. `assert_redirected_to` does not show user-supplied message. | ||||
| * | | | Fix `assert_redirected_to` does not show user-supplied message. | Alexey Chernenkov | 2013-07-18 | 3 | -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_test | Carlos Antonio da Silva | 2013-07-17 | 1 | -32/+0 |
|\| | | | | | | | | Removed unused test file |