aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clarify the documentation on the Rails::Application#call methodDavid Czarnecki2012-09-151-2/+2
* Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
* Merge pull request #7655 from steveklabnik/masterRafael Mendonça França2012-09-151-0/+1
|\
| * fix the buildSteve Klabnik2012-09-151-0/+1
|/
* Merge pull request #7643 from steveklabnik/deprecate_silenceRafael Mendonça França2012-09-153-12/+23
|\
| * Deprecate ActiveSupport::Benchmarkable#silence.Steve Klabnik2012-09-153-12/+23
* | Merge pull request #7654 from steveklabnik/issue_4857Xavier Noria2012-09-151-0/+8
|\ \
| * | Improve Process::Status#to_jsonSteve Klabnik2012-09-151-0/+8
* | | Merge pull request #7649 from steveklabnik/issue_2520Rafael Mendonça França2012-09-153-1/+48
|\ \ \
| * | | Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-153-1/+48
| |/ /
* | | Fix syntax error in assert_matchRafael Mendonça França2012-09-151-6/+6
* | | Merge pull request #7653 from arunagw/warnings-removedRafael Mendonça França2012-09-151-3/+3
|\ \ \
| * | | Few more warnings removed.Arun Agrawal2012-09-152-4/+4
| |/ /
* / / simplify rescueJon Leighton2012-09-151-3/+3
|/ /
* | Fix testJon Leighton2012-09-152-15/+21
* | Ensure disconnecting or reconnecting resets the transaction stateJon Leighton2012-09-157-9/+55
* | Remove our use of #outside_transaction?Jon Leighton2012-09-153-61/+17
* | Remove the transaction_open variableJon Leighton2012-09-152-21/+33
* | Move transaction joinability into the transaction objectJon Leighton2012-09-155-20/+36
* | Alter the naming structure a bitJon Leighton2012-09-153-108/+111
* | Split Open into Real and SavepointJon Leighton2012-09-151-25/+38
* | DRYJon Leighton2012-09-151-4/+8
* | Don't do the rollback in #commitJon Leighton2012-09-152-18/+7
* | Store the transaction number in the transaction objectJon Leighton2012-09-155-13/+30
* | Start to tease out transaction handling into a state machineJon Leighton2012-09-156-87/+158
* | Revert "create a transaction object and point AR objects at that object durin...Jon Leighton2012-09-154-55/+12
* | Move queue classes to ActiveSupportSantiago Pastorino2012-09-1417-182/+180
* | Merge pull request #7642 from lest/patch-1José Valim2012-09-141-0/+16
|\ \
| * | update CHANGELOGSergey Nartimov2012-09-141-0/+16
|/ /
* | Merge pull request #7635 from arunagw/warning_removed_shadowing_variableJosé Valim2012-09-141-2/+2
|\ \
| * | warning removed: shadowing outer local variable - messageArun Agrawal2012-09-141-2/+2
| |/
* | Merge pull request #7634 from arunagw/build_fix_actionmailerJosé Valim2012-09-141-0/+1
|\ \
| * | Build fix for ActionMailerArun Agrawal2012-09-141-0/+1
| |/
* | Merge pull request #7637 from NARKOZ/patch-3Jeremy Kemper2012-09-131-1/+1
|\ \ | |/ |/|
| * use presence method instead of checking for blankNihad Abbasov2012-09-141-1/+1
|/
* Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-134-33/+159
|\
| * Implement :null_session CSRF protection methodSergey Nartimov2012-09-134-33/+159
* | Merge pull request #7628 from Pranas/deep_merge_with_blockRafael Mendonça França2012-09-133-4/+23
|\ \
| * | Allow passing block to deep_merge and deep_merge!Pranas Kiziela2012-09-133-4/+23
|/ /
* | Copy-edit deprecation relared documentation [ci skip]Rafael Mendonça França2012-09-135-74/+51
* | Merge pull request #7524 from al2o3cr/store_booleanRafael Mendonça França2012-09-134-9/+67
|\ \
| * | refactor store_accessorMatt Jones2012-09-134-9/+67
|/ /
* | Merge pull request #6348 from LTe/no_global_depreactationsCarlos Antonio da Silva2012-09-139-98/+412
|\ \
| * | Change ActiveSupport::Deprecation to class.Piotr Niełacny2012-09-139-221/+405
| * | extend ActiveSupport::Deprecation with self, allow other objects to extend/in...Robert Pankowecki2012-09-136-102/+232
|/ /
* | Merge pull request #7623 from tchandy/masterRafael Mendonça França2012-09-121-1/+1
|\ \
| * | update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branchThiago Pradi2012-09-131-1/+1
|/ /
* | Merge pull request #7614 from frodsan/scm_agnosticRafael Mendonça França2012-09-126-65/+90
|\ \
| * | change app/plugin generators to be more SCM agnosticDerek Prior2012-09-126-65/+90
|/ /
* | Pass in the model class rather than engineJon Leighton2012-09-133-8/+8