aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove mass assignment security from ActiveRecordGuillermo Iguaran2012-09-1620-1170/+18
* Remove MassAssignmentSecurity from ActiveModelGuillermo Iguaran2012-09-1616-816/+15
* Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gemGuillermo Iguaran2012-09-164-0/+54
* Integrate ActionController::Parameters from StrongParameters gemGuillermo Iguaran2012-09-168-0/+340
* Merge pull request #7662 from frodsan/ar_changelogRafael Mendonça França2012-09-161-44/+68
|\
| * improve AR/CHANGELOG [ci skip]Francesco Rodriguez2012-09-161-44/+68
|/
* Merge pull request #7547 from danmcclain/pg-arraysRafael Mendonça França2012-09-1612-53/+435
|\
| * Moves column dump specific code to a module included in AbstractAdapterDan McClain2012-09-1412-53/+435
* | Remove debug code :bomb:Rafael Mendonça França2012-09-161-1/+0
* | Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-162-2/+33
|\ \
| * | Don't preserve SELECT columns on COUNTSteve Klabnik2012-09-162-2/+33
* | | Merge pull request #7645 from larrylv/configurable-defaultsRafael Mendonça França2012-09-163-8/+45
|\ \ \
| * | | set up config_accessor with a default value by blockLarry Lv2012-09-173-8/+45
|/ / /
* | | Merge pull request #7657 from kennyj/fix_6458-2Piotr Sarnacki2012-09-163-1/+14
|\ \ \
| * | | Don't explain except normal CRUD sql.kennyj2012-09-173-1/+14
* | | | Merge pull request #7652 from toshi-kawanishi/find_in_batchesCarlos Antonio da Silva2012-09-164-6/+38
|\| | |
| * | | Fix find_in_batches with customized primary_keyToshiyuki Kawanishi2012-09-164-6/+38
|/ / /
* | | Merge pull request #7648 from kennyj/rename_2_schemaRafael Mendonça França2012-09-152-5/+5
|\ \ \
| * | | Query for sequence info also should be markd as SCHEMA.kennyj2012-09-151-3/+3
| * | | Query for loading index info should be marked as SCHEMA.kennyj2012-09-152-2/+2
* | | | Merge pull request #7656 from czarneckid/clarify-documentationXavier Noria2012-09-151-2/+2
|\ \ \ \
| * | | | 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
|/ /