aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_findersGodfrey Chan2014-01-201-0/+3
|\ | | | | Add link to upgrade guide for full list of deprecated finders [ci skip]
| * Add link to upgrade guide for full list of deprecated finders [ci skip]Zachary Scott2014-01-191-0/+3
| |
* | Merge pull request #13769 from arelenglish/fix_typo_upgrad_guideGodfrey Chan2014-01-191-1/+1
|\ \ | | | | | | Fix a typo that says you application [ci skip]
| * | Fix a typo that says you application [ci skip]Arel English2014-01-201-1/+1
|/ /
* | Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_linkGodfrey Chan2014-01-191-1/+1
|\ \ | | | | | | Fix for incorrect link that is pointing to Rails blog [ci skip]
| * | Correcting link that is pointing to Rails blog [ci skip]Rajesh Thummalapally2014-01-191-1/+1
|/ /
* | Merge pull request #13765 from robertomiranda/secrets_tokenGuillermo Iguaran2014-01-191-4/+4
|\ \ | | | | | | Update Error Message when secrets.secret_key_base isn't given
| * | Update Error Message when secrets.secret_key_base isn't givenrobertomiranda2014-01-191-4/+4
| | |
* | | Merge pull request #13745 from nextgearcapital/masterRafael Mendonça França2014-01-193-0/+6
|\ \ \ | | | | | | | | set encoding for pipe to binary mode
| * | | set encoding to binmode for pipeAnna Carey2014-01-173-0/+6
| | | |
* | | | Merge pull request #13762 from robertomiranda/spring-under-railsRobin Dupret2014-01-191-1/+1
|\ \ \ \ | |_|/ / |/| | | Update Changelog, Spring is under rails/spring [ci skip]
| * | | Update Changelog, Spring is under rails/spring [ci skip]robertomiranda2014-01-191-1/+1
|/ / /
* | | Merge pull request #13759 from raysrashmi/rails-springRobin Dupret2014-01-193-4/+4
|\ \ \ | | | | | | | | Spring in now under rails/spring [ci skip]
| * | | Spring in now under rails/spring [ci skip]Rashmi Yadav2014-01-193-4/+4
|/ / /
* | | Merge pull request #13756 from huoxito/rails-springAndrew White2014-01-191-1/+1
|\ \ \ | | | | | | | | spring gem moved to rails/spring
| * | | spring gem moved to rails/springWashington Luiz2014-01-181-1/+1
|/ / /
* | | Merge pull request #13751 from chancancode/ar_rollback_fixGodfrey Chan2014-01-184-6/+26
|\ \ \ | | | | | | | | Restore ActiveRecord states after a rollback for models w/o callbacks
| * | | Restore ActiveRecord states after a rollback for models w/o callbacksGodfrey Chan2014-01-184-6/+26
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression (#13744) that was caused by 67d8bb9. In 67d8bb9, we introduced lazy rollback for records, such that the record's internal states and attributes are not restored immediately after a transaction rollback, but deferred until they are first accessed. This optimization is only performed when the model does not have any transactional callbacks (e.g. `after_commit` and `after_create`). Unfortunately, the models used to test the affected codepaths all comes with some sort of transactional callbacks. Therefore this codepath remains largely untested until now and as a result there are a few issues in the implementation that remains hidden until now. First, the `sync_with_transaction_state` (or more accurately, `update_attributes_from_transaction_state`) would perform the synchronization prematurely before a transaction is finalized (i.e. comitted or rolled back). As a result, when the actuall rollback happens, the record will incorrectly assumes that its internal states match the transaction state, and neglect to perform the restore. Second, `update_attributes_from_transaction_state` calls `committed!` in some cases. This in turns checks for the `destroyed?` state which also requires synchronization with the transaction stae, which causes an infnite recurrsion. This fix works by deferring the synchronization until the transaction has been finalized (addressing the first point), and also unrolled the `committed!` and `rolledback!` logic in-place (addressing the second point). It should be noted that the primary purpose of the `committed!` and `rolledback!` methods are to trigger the relevant transactional callbacks. Since this code path is only entered when there are no transactional callbacks on the model, this shouldn't be necessary. By unrolling the method calls, the intention here (to restore the states when necessary) becomes more clear.
* | | Merge pull request #13748 from summerblue/masterRichard Schneeman2014-01-171-1/+1
|\ \ \ | | | | | | | | Correct the version number to 4 in guides[ci skip]
| * | | Correct the version number to 4 in guides[ci skip]Charlie Jade2014-01-181-1/+1
|/ / /
* | | fix exception translationAaron Patterson2014-01-172-3/+4
| | |
* | | translate exceptions on prepared statement failureAaron Patterson2014-01-172-6/+13
| | |
* | | test to ensure bad prepared statements raise a StatementInvalid exceptionAaron Patterson2014-01-171-0/+6
|/ /
* | 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
| | | | | | | find_by_* and find_by_*! are not deprecated for example, so lets add a note only where it is needed [ci skip]
* Merge pull request #13735 from xta/cleanup_security_guideLauro Caetano2014-01-161-1/+1
|\ | | | | clean up security guide: his => their [ci skip]
| * 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
|\ | | | | Improve ERB dependency detection
| * Update changelogJoão Britto2014-01-091-0/+7
| |
| * Avoid scanning multiple render calls as a single match.João Britto2014-01-092-21/+45
| | | | | | | | Each chunk of text coming after `render` is now handled individually as a possible list of arguments.
| * Improve ERB dependency detection.João Britto2014-01-092-21/+145
| | | | | | | | | | | | | | | | | | | | | | The current implementation can't handle some special cases of oddly-formatted Ruby. Now we are able to detect them: * Multi-line arguments on the `render` call * Strings containing quotes, e.g. `"something's wrong"` * Multiple kinds of identifiers - instance variables, class variables and globals * Method chains as arguments for the `render` call Also, this fix reduces the rate of "false positives" which showed up when we had calls/access to identifiers containing `render`, like `surrender` and `rendering`.
* | 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
| | | | | | | | | | Just create a local variable whenever we need the record, rather than doing an extra find for every test on the setup method.
* | 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 fixture class name deprecation warning to give more information about caller
| * | Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
| | |
* | | define the delegate methods on one line. fixes #13724Aaron Patterson2014-01-162-20/+32
|/ / | | | | | | sup haters
* | 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 callbacks. Closes #12031.
| * | 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
|/ / | | | | | | | | Ensure the child can actually be touched. The `Bulb` model has no timestamp column, thus trying to touch it would return `nil`.
* | Revert "methods are defined right after the module_eval, so we don't need to do"Piotr Sarnacki2014-01-161-2/+2
| | | | | | | | | | | | | | | | | | This change breaks tests in activesupport/test/core_ext/module_test.rb: * test_delegation_exception_backtrace * test_delegation_exception_backtrace_with_allow_nil This reverts commit 0167765e3f84260522bc2f32d926c1f5dd44957c.
* | Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
| | | | | | | | | | | | | | The revert is needed because of a regression described in #13369, routes with trailing slash are no longer recognized properly. This reverts commit 50311f1391ddd8e0349d74eb57f04b7e0045a27d.
* | Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
| | | | | | | | | | | | After introducing 50311f1 a regression was introduced: routes with trailing slash are no longer recognized properly. This commit provides a failing test for this situation.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 23:43:58 +0000