aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert "refactor delete a little"Aaron Patterson2010-10-151-1/+4
| | | | | | | | This reverts commit f3f34bce8fc2895e05c4a06bb4105d6155fa423d.
| * Removed duplicated method find_root_with_flagPiotr Sarnacki2010-10-151-15/+0
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * in regexps, the dot in a character class is not a metacharacterXavier Noria2010-10-157-8/+8
| |
| * Fix for ActionView::Template#refresh in rails 3.1.0.betaAndré Camargo2010-10-152-3/+3
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * #transaction on the instance level should take options as wellCarl Lerche2010-10-142-2/+23
| |
| * Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵Michael Koziarski2010-10-152-23/+20
| | | | | | | | | | | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-145-15/+5
| |\
| | * Use <em> rather than underscores to fix display issue with 4.1.1.1 in the ↵Ryan Bigg and Xavier Noria2010-10-141-1/+1
| | | | | | | | | | | | asssociation basics guide
| | * Removed miscelenous letters.Ugis Ozols2010-10-131-1/+1
| | |
| | * Remove doc for debugging callbacks. Methods don't exist in Rails masterRafael Mendonça França2010-10-131-10/+0
| | |
| | * Merge branch 'master' of github.com:lifo/docrailsKrekoten' Marjan2010-10-121-2/+2
| | |\
| | | * fix time.to_formatted_time(:time) exampleAditya Sanghi2010-10-131-2/+2
| | | |
| | * | Fix small typo in documentationKrekoten' Marjan2010-10-121-1/+1
| | |/
* | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| | |
* | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| | |
* | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-195-199/+0
| | | | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\!
* | | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-195-2/+80
| | |
* | | Fix broken testJon Leighton2010-10-191-1/+5
| | |
* | | Small refactoringJon Leighton2010-10-191-6/+2
| | |
* | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-196-7/+32
| | | | | | | | | | | | association
* | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | |
* | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | |
* | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-1910-18/+41
| | | | | | | | | | | | association, where the source is a has_one or has_many
* | | Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-199-11/+65
| | | | | | | | | | | | through associations
* | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-1916-98/+235
| | | | | | | | | | | | through association
* | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵Jon Leighton2010-10-1711-154/+138
| | | | | | | | | | | | etc with just a single scope hash (created on initialization of the proxy). This is now used consistently across all associations. Therefore, all you have to do to ensure finding/counting etc is done correctly is implement the scope correctly.
* | | Make sure nested through associations are read onlyJon Leighton2010-10-156-9/+82
| | |
* | | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| | |
* | | Add assertions for nested through associations loaded by includes with ↵Jon Leighton2010-10-151-81/+75
| | | | | | | | | | | | conditions (uses the single-query strategy). Currently one failure to fix.
* | | Support preloading nested through associations (using the default ↵Jon Leighton2010-10-152-122/+216
| | | | | | | | | | | | multi-query strategy)
* | | Remove unnecessary requires from nested_has_many_through_associations_test.rbJon Leighton2010-10-141-6/+0
| | |
* | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflectionJon Leighton2010-10-147-4/+31
| | |
* | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵Jon Leighton2010-10-142-2/+15
| | | | | | | | | | | | (which already passes)
* | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵Jon Leighton2010-10-142-1/+13
| | | | | | | | | | | | (which already works)
* | | Added ↵Jon Leighton2010-10-145-4/+30
| | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
* | | Fix bug in previous refactoringJon Leighton2010-10-141-6/+6
| | |
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-14160-1320/+8646
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
| * | Remove :cache => true on lookup templates initialization.José Valim2010-10-147-53/+3
| | |
| * | SReorganize autoloads slightly and move two files to lib/action_view root.José Valim2010-10-145-11/+8
| | |
| * | render :once should consider the current controller prefix.José Valim2010-10-145-13/+41
| | |
| * | Comment internal railties tasks.José Valim2010-10-141-1/+1
| | |
| * | Use railtie_name to correctly get name from pluginsPiotr Sarnacki2010-10-141-1/+1
| | |
| * | Remove task for creating symlinks for railtiesPiotr Sarnacki2010-10-142-76/+0
| | |
| * | Update documentation for new tasksPiotr Sarnacki2010-10-141-7/+8
| | |
| * | Add task foo:install (where foo is plugin) as a shortcutinstall:migrations ↵Piotr Sarnacki2010-10-142-0/+30
| | | | | | | | | | | | and foo:install:assets
| * | Added foo:install:assets task that copies assets from plugins public ↵Piotr Sarnacki2010-10-143-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory to application's public directory This is the most simple and naive approach: just copy every files from engine to app. The only exception is when file has changed, in that case developer will be asked if he wants to rename the field. There is no need to make this task more sophisticated as 3.1 will be shipped with better assets handling and it will be the default way to handle things.
| * | Do not treat information about skipped migrations as WARNINGs but as a ↵Piotr Sarnacki2010-10-143-6/+12
| | | | | | | | | | | | NOTEs, also puts to stdin
| * | Revert "speeding up flattened version of OrderedHash.[]"Aaron Patterson2010-10-131-2/+3
| | | | | | | | | | | | This reverts commit 9c53e82d66d0c34b8f35609b7972f28521d5794d.
| * | speeding up flattened version of OrderedHash.[]Aaron Patterson2010-10-131-3/+2
| | |
| * | refactor delete a littleAaron Patterson2010-10-131-4/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:39:00 +0000