aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-01-1712-220/+360
|\
| * Fix eager load of Serializers on Active ModelCarlos Antonio da Silva2014-01-171-2/+2
| * Consistence in the block styleRafael Mendonça França2014-01-172-5/+5
| * Remove warnings on Ruby 2.1Rafael Mendonça França2014-01-172-1/+9
| * Only some dynamic finders are deprecated.Rafael Mendonça França2014-01-161-5/+5
| * Merge pull request #13735 from xta/cleanup_security_guideLauro Caetano2014-01-161-1/+1
| |\
| | * clean up security guide: his => their [ci skip]Rex Feng2014-01-161-1/+1
| |/
| * Remove warningRafael Mendonça França2014-01-161-2/+2
| * Merge pull request #13414 from britto/jb-fix-dependency-matchingRafael Mendonça França2014-01-163-29/+184
| |\
| | * Update changelogJoão Britto2014-01-091-0/+7
| | * Avoid scanning multiple render calls as a single match.João Britto2014-01-092-21/+45
| | * Improve ERB dependency detection.João Britto2014-01-092-21/+145
| * | Extract a method to simplify setup codeCarlos Antonio da Silva2014-01-161-23/+27
| * | Use minitest's skip rather than conditionals + early returnsCarlos Antonio da Silva2014-01-161-47/+38
| * | Move AR test classes inside the test caseCarlos Antonio da Silva2014-01-161-38/+46
| * | Do not set up a variable used only in two testsCarlos Antonio da Silva2014-01-161-15/+18
| * | No need for instance vars on single testsCarlos Antonio da Silva2014-01-161-8/+8
| * | Cleanup duplicated setup of callbacks in transactions testsCarlos Antonio da Silva2014-01-161-48/+19
| * | No need to use #send with public methodsCarlos Antonio da Silva2014-01-161-10/+10
| * | Merge pull request #13734 from tjschuck/fixture_class_name_deprecation_warningCarlos Antonio da Silva2014-01-161-2/+2
| |\ \
| | * | Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
* | | | change query strategy based on adapterAaron Patterson2014-01-164-5/+51
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-01-162-20/+32
|\| | |
| * | | define the delegate methods on one line. fixes #13724Aaron Patterson2014-01-162-20/+32
| |/ /
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-01-1626-100/+168
|\| |
| * | Merge branch 'ca-touch-commit-callbacks'Carlos Antonio da Silva2014-01-166-11/+80
| |\ \
| | * | Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-165-2/+71
| | * | Fix test for cache_key + touchedCarlos Antonio da Silva2014-01-161-9/+9
| |/ /
| * | Revert "methods are defined right after the module_eval, so we don't need to do"Piotr Sarnacki2014-01-161-2/+2
| * | Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
| * | Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
| * | Merge branch 'fix_order_dependent_tests_in_active_record_suite'Yves Senn2014-01-168-43/+45
| |\ \
| | * | reset column information after fiddling with `Encoding.default_internal`Yves Senn2014-01-161-0/+1
| | * | we have `with_env_tz` as global test helper. Remove duplicate.Yves Senn2014-01-162-14/+0
| | * | isolate class attribute assignment in `migration_test.rb`Yves Senn2014-01-161-22/+33
| | * | use `teardown` for cleanup, not `setup`.Yves Senn2014-01-161-5/+2
| | * | tests without transactional fixtures need to cleanup afterwards.Yves Senn2014-01-161-0/+7
| | * | no need to `return skip` in tests. `skip` is enough.Yves Senn2014-01-164-4/+4
| |/ /
| * | methods are defined right after the module_eval, so we don't need to doAaron Patterson2014-01-151-2/+2
| * | Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| * | Avoid converting :on option to array twice when defining commit/rollback call...Carlos Antonio da Silva2014-01-151-3/+2
| * | Unify changelog entries about single quotes [ci skip]Carlos Antonio da Silva2014-01-151-5/+1
| * | Merge pull request #13713 from chulkilee/use-single-quotesCarlos Antonio da Silva2014-01-158-20/+24
| |\ \
| | * | Use single quotes in generated filesChulki Lee2014-01-148-20/+24
* | | | use a params hash so we know what bind parameters are usedAaron Patterson2014-01-153-25/+65
* | | | use edge arelAaron Patterson2014-01-151-0/+1
* | | | some databases do not have bind params (mysql2) so take that in to accountAaron Patterson2014-01-141-2/+6
* | | | fix exception translationAaron Patterson2014-01-142-3/+4
* | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-15/+2
|\| | |
| * | | rm dup codeAaron Patterson2014-01-141-13/+0