| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | moving controller_name assignment before model name condition | anilmaurya | 2014-01-20 | 1 | -3/+1 |
| | | |||||
| * | Tidy up tests and CHANGELOG for #12598 | Andrew White | 2014-01-20 | 4 | -7/+37 |
| | | |||||
| * | Automatically convert dashes to underscores in shorthand routes | Mikko Johansson | 2014-01-20 | 2 | -0/+11 |
| | | |||||
| * | Automatically convert dashes to underscores for url helpers | Amr Tamimi | 2014-01-20 | 4 | -2/+20 |
| | | |||||
| * | docs should say `email` not `Email`. [ci skip] | Yves Senn | 2014-01-20 | 3 | -4/+4 |
| | | |||||
| * | docs, hyperlink the `Mail gem` in Action Mailer guide. [ci skip] | Yves Senn | 2014-01-20 | 1 | -2/+2 |
| | | |||||
| * | let's link to the gem README not to the upgrading guide. [ci skip] | Yves Senn | 2014-01-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | The PR #13767 added link to the upgrading guide to explain details about activerecord_deprecated-finders. However the link target features a stack of changes not releated at all. Also the relevant details are not very informative. I think we better link to the README so people can see what the gem is about and how to use it. /cc @chancancode @zzak | ||||
| * | Fix secrets.yml path in exception message | Carlos Antonio da Silva | 2014-01-20 | 1 | -9/+7 |
| | | | | | The file is config/secrets.yml, not config/initializers/secrets.yml. | ||||
| * | Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_finders | Godfrey Chan | 2014-01-20 | 1 | -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 Scott | 2014-01-19 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #13769 from arelenglish/fix_typo_upgrad_guide | Godfrey Chan | 2014-01-19 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix a typo that says you application [ci skip] | ||||
| | * | | Fix a typo that says you application [ci skip] | Arel English | 2014-01-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_link | Godfrey Chan | 2014-01-19 | 1 | -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 Thummalapally | 2014-01-19 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #13765 from robertomiranda/secrets_token | Guillermo Iguaran | 2014-01-19 | 1 | -4/+4 |
| |\ \ | | | | | | | Update Error Message when secrets.secret_key_base isn't given | ||||
| | * | | Update Error Message when secrets.secret_key_base isn't given | robertomiranda | 2014-01-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge pull request #13745 from nextgearcapital/master | Rafael Mendonça França | 2014-01-19 | 3 | -0/+6 |
| |\ \ \ | | | | | | | | | set encoding for pipe to binary mode | ||||
| | * | | | set encoding to binmode for pipe | Anna Carey | 2014-01-17 | 3 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #13762 from robertomiranda/spring-under-rails | Robin Dupret | 2014-01-19 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | Update Changelog, Spring is under rails/spring [ci skip] | ||||
| | * | | | Update Changelog, Spring is under rails/spring [ci skip] | robertomiranda | 2014-01-19 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #13759 from raysrashmi/rails-spring | Robin Dupret | 2014-01-19 | 3 | -4/+4 |
| |\ \ \ | | | | | | | | | Spring in now under rails/spring [ci skip] | ||||
| | * | | | Spring in now under rails/spring [ci skip] | Rashmi Yadav | 2014-01-19 | 3 | -4/+4 |
| |/ / / | |||||
| * | | | Merge pull request #13756 from huoxito/rails-spring | Andrew White | 2014-01-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | spring gem moved to rails/spring | ||||
| | * | | | spring gem moved to rails/spring | Washington Luiz | 2014-01-18 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #13751 from chancancode/ar_rollback_fix | Godfrey Chan | 2014-01-18 | 4 | -6/+26 |
| |\ \ \ | | | | | | | | | Restore ActiveRecord states after a rollback for models w/o callbacks | ||||
| | * | | | Restore ActiveRecord states after a rollback for models w/o callbacks | Godfrey Chan | 2014-01-18 | 4 | -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/master | Richard Schneeman | 2014-01-17 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Correct the version number to 4 in guides[ci skip] | ||||
| | * | | | Correct the version number to 4 in guides[ci skip] | Charlie Jade | 2014-01-18 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | fix exception translation | Aaron Patterson | 2014-01-17 | 2 | -3/+4 |
| | | | | |||||
| * | | | translate exceptions on prepared statement failure | Aaron Patterson | 2014-01-17 | 2 | -6/+13 |
| | | | | |||||
| * | | | test to ensure bad prepared statements raise a StatementInvalid exception | Aaron Patterson | 2014-01-17 | 1 | -0/+6 |
| |/ / | |||||
| * | | Fix eager load of Serializers on Active Model | Carlos Antonio da Silva | 2014-01-17 | 1 | -2/+2 |
| | | | |||||
| * | | Consistence in the block style | Rafael Mendonça França | 2014-01-17 | 2 | -5/+5 |
| | | | |||||
| * | | Remove warnings on Ruby 2.1 | Rafael Mendonça França | 2014-01-17 | 2 | -1/+9 |
| |/ | |||||
| * | Only some dynamic finders are deprecated. | Rafael Mendonça França | 2014-01-16 | 1 | -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_guide | Lauro Caetano | 2014-01-16 | 1 | -1/+1 |
| |\ | | | | | clean up security guide: his => their [ci skip] | ||||
| | * | clean up security guide: his => their [ci skip] | Rex Feng | 2014-01-16 | 1 | -1/+1 |
| |/ | |||||
| * | Remove warning | Rafael Mendonça França | 2014-01-16 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #13414 from britto/jb-fix-dependency-matching | Rafael Mendonça França | 2014-01-16 | 3 | -29/+184 |
| |\ | | | | | Improve ERB dependency detection | ||||
| | * | Update changelog | João Britto | 2014-01-09 | 1 | -0/+7 |
| | | | |||||
| | * | Avoid scanning multiple render calls as a single match. | João Britto | 2014-01-09 | 2 | -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 Britto | 2014-01-09 | 2 | -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 code | Carlos Antonio da Silva | 2014-01-16 | 1 | -23/+27 |
| | | | |||||
| * | | Use minitest's skip rather than conditionals + early returns | Carlos Antonio da Silva | 2014-01-16 | 1 | -47/+38 |
| | | | |||||
| * | | Move AR test classes inside the test case | Carlos Antonio da Silva | 2014-01-16 | 1 | -38/+46 |
| | | | |||||
| * | | Do not set up a variable used only in two tests | Carlos Antonio da Silva | 2014-01-16 | 1 | -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 tests | Carlos Antonio da Silva | 2014-01-16 | 1 | -8/+8 |
| | | | |||||
| * | | Cleanup duplicated setup of callbacks in transactions tests | Carlos Antonio da Silva | 2014-01-16 | 1 | -48/+19 |
| | | | |||||
| * | | No need to use #send with public methods | Carlos Antonio da Silva | 2014-01-16 | 1 | -10/+10 |
| | | | |||||
| * | | Merge pull request #13734 from tjschuck/fixture_class_name_deprecation_warning | Carlos Antonio da Silva | 2014-01-16 | 1 | -2/+2 |
| |\ \ | | | | | | | Update fixture class name deprecation warning to give more information about caller | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |