Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #7656 from czarneckid/clarify-documentation | Xavier Noria | 2012-09-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Clarify the documentation on the Rails::Application#call method | David Czarnecki | 2012-09-15 | 1 | -2/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Check if etag exists before to do the gsub | Rafael Mendonça França | 2012-09-15 | 1 | -2/+4 | |
* | | | | | | | | | | Merge pull request #7655 from steveklabnik/master | Rafael Mendonça França | 2012-09-15 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fix the build | Steve Klabnik | 2012-09-15 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #7643 from steveklabnik/deprecate_silence | Rafael Mendonça França | 2012-09-15 | 3 | -12/+23 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Deprecate ActiveSupport::Benchmarkable#silence. | Steve Klabnik | 2012-09-15 | 3 | -12/+23 | |
* | | | | | | | | | | Merge pull request #7654 from steveklabnik/issue_4857 | Xavier Noria | 2012-09-15 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Improve Process::Status#to_json | Steve Klabnik | 2012-09-15 | 1 | -0/+8 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #7649 from steveklabnik/issue_2520 | Rafael Mendonça França | 2012-09-15 | 3 | -1/+48 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 3 | -1/+48 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Fix syntax error in assert_match | Rafael Mendonça França | 2012-09-15 | 1 | -6/+6 | |
* | | | | | | | | | | Merge pull request #7653 from arunagw/warnings-removed | Rafael Mendonça França | 2012-09-15 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Few more warnings removed. | Arun Agrawal | 2012-09-15 | 2 | -4/+4 | |
| |/ / / / / / / / / | ||||||
* / / / / / / / / / | simplify rescue | Jon Leighton | 2012-09-15 | 1 | -3/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Fix test | Jon Leighton | 2012-09-15 | 2 | -15/+21 | |
* | | | | | | | | | Ensure disconnecting or reconnecting resets the transaction state | Jon Leighton | 2012-09-15 | 7 | -9/+55 | |
* | | | | | | | | | Remove our use of #outside_transaction? | Jon Leighton | 2012-09-15 | 3 | -61/+17 | |
* | | | | | | | | | Remove the transaction_open variable | Jon Leighton | 2012-09-15 | 2 | -21/+33 | |
* | | | | | | | | | Move transaction joinability into the transaction object | Jon Leighton | 2012-09-15 | 5 | -20/+36 | |
* | | | | | | | | | Alter the naming structure a bit | Jon Leighton | 2012-09-15 | 3 | -108/+111 | |
* | | | | | | | | | Split Open into Real and Savepoint | Jon Leighton | 2012-09-15 | 1 | -25/+38 | |
* | | | | | | | | | DRY | Jon Leighton | 2012-09-15 | 1 | -4/+8 | |
* | | | | | | | | | Don't do the rollback in #commit | Jon Leighton | 2012-09-15 | 2 | -18/+7 | |
* | | | | | | | | | Store the transaction number in the transaction object | Jon Leighton | 2012-09-15 | 5 | -13/+30 | |
* | | | | | | | | | Start to tease out transaction handling into a state machine | Jon Leighton | 2012-09-15 | 6 | -87/+158 | |
* | | | | | | | | | Revert "create a transaction object and point AR objects at that object durin... | Jon Leighton | 2012-09-15 | 4 | -55/+12 | |
* | | | | | | | | | Move queue classes to ActiveSupport | Santiago Pastorino | 2012-09-14 | 17 | -182/+180 | |
* | | | | | | | | | Merge pull request #7642 from lest/patch-1 | José Valim | 2012-09-14 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | update CHANGELOG | Sergey Nartimov | 2012-09-14 | 1 | -0/+16 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7635 from arunagw/warning_removed_shadowing_variable | José Valim | 2012-09-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | warning removed: shadowing outer local variable - message | Arun Agrawal | 2012-09-14 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #7634 from arunagw/build_fix_actionmailer | José Valim | 2012-09-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Build fix for ActionMailer | Arun Agrawal | 2012-09-14 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #7637 from NARKOZ/patch-3 | Jeremy Kemper | 2012-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | use presence method instead of checking for blank | Nihad Abbasov | 2012-09-14 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 4 | -33/+159 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 4 | -33/+159 | |
* | | | | | | | Merge pull request #7628 from Pranas/deep_merge_with_block | Rafael Mendonça França | 2012-09-13 | 3 | -4/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Allow passing block to deep_merge and deep_merge! | Pranas Kiziela | 2012-09-13 | 3 | -4/+23 | |
|/ / / / / / / | ||||||
* | | | | | | | Copy-edit deprecation relared documentation [ci skip] | Rafael Mendonça França | 2012-09-13 | 5 | -74/+51 | |
* | | | | | | | Merge pull request #7524 from al2o3cr/store_boolean | Rafael Mendonça França | 2012-09-13 | 4 | -9/+67 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | refactor store_accessor | Matt Jones | 2012-09-13 | 4 | -9/+67 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6348 from LTe/no_global_depreactations | Carlos Antonio da Silva | 2012-09-13 | 9 | -98/+412 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Change ActiveSupport::Deprecation to class. | Piotr Niełacny | 2012-09-13 | 9 | -221/+405 | |
| * | | | | | | | extend ActiveSupport::Deprecation with self, allow other objects to extend/in... | Robert Pankowecki | 2012-09-13 | 6 | -102/+232 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7623 from tchandy/master | Rafael Mendonça França | 2012-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branch | Thiago Pradi | 2012-09-13 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7614 from frodsan/scm_agnostic | Rafael Mendonça França | 2012-09-12 | 6 | -65/+90 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | change app/plugin generators to be more SCM agnostic | Derek Prior | 2012-09-12 | 6 | -65/+90 | |
|/ / / / / / / |