aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10543 from vipulnsward/to_sortCarlos Antonio da Silva2013-05-101-1/+1
|\
| * sort => sort! on new arrayVipul A M2013-05-101-1/+1
* | Set the inverse when association queries are refinedJon Leighton2013-05-104-1/+33
* | Merge pull request #10510 from think602/masterXavier Noria2013-05-091-0/+1
|\ \ | |/ |/|
| * [ci skip] document protect_against_forgery? methodWeston Platter2013-05-101-0/+1
* | Merge pull request #10535 from vipulnsward/remove_varCarlos Antonio da Silva2013-05-091-1/+0
|\ \
| * | remove redundant varVipul A M2013-05-091-1/+0
* | | Merge pull request #10536 from vipulnsward/fix_exp_warningCarlos Antonio da Silva2013-05-091-1/+0
|\ \ \
| * | | remove variable and fix warningVipul A M2013-05-091-1/+0
| |/ /
* | | Merge pull request #10531 from waseem/refactor_requireCarlos Antonio da Silva2013-05-091-4/+4
|\ \ \
| * | | Require different core extensions correctly.Waseem Ahmad2013-05-091-4/+4
* | | | Merge pull request #10532 from prathamesh-sonpatki/RailsXavier Noria2013-05-095-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-095-5/+5
|/ / /
* / / "rails" -> "Rails" [ci skip]Xavier Noria2013-05-092-4/+4
|/ /
* | Fix that JSON and XML exception responses should give the HTTP error message ...Jeremy Kemper2013-05-082-4/+4
* | Merge pull request #10523 from neerajdotname/last-where-clause-winsJeremy Kemper2013-05-081-13/+12
|\ \
| * | extracted piece of code into a methodNeeraj Singh2013-05-081-13/+12
* | | use public send on the scope parametersAaron Patterson2013-05-081-1/+1
* | | add test for object conditional with scopeAaron Patterson2013-05-081-0/+19
* | | using strings as scopes is not used anywhere, so remove itAaron Patterson2013-05-081-1/+1
* | | adding a class conditional testAaron Patterson2013-05-081-0/+12
* | | adding tests for lambdas as conditionsAaron Patterson2013-05-082-1/+41
* | | Merge branch 'polycb'Aaron Patterson2013-05-081-22/+48
|\ \ \
| * | | separate identification computationAaron Patterson2013-05-081-24/+18
| * | | separate filters from source codeAaron Patterson2013-05-081-20/+31
| * | | if the callbacks are not the same class, they cannot be duplicatesAaron Patterson2013-05-081-2/+6
| * | | fix object comparison caseAaron Patterson2013-05-081-1/+5
| * | | polymorphic comparison operatorAaron Patterson2013-05-081-11/+24
* | | | Merge pull request #10524 from wangjohn/define_method_for_callbacksRafael Mendonça França2013-05-081-18/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Using define method instead of class eval when defining model callbacks.wangjohn2013-05-081-18/+12
|/ / /
* / / we need to indicate the type of callbackAaron Patterson2013-05-081-2/+2
|/ /
* | Merge pull request #10355 from burke/masterJeremy Kemper2013-05-081-39/+19
|\ \
| * | Use ruby's Encoding support for tidy_bytesBurke Libbey2013-05-081-39/+19
* | | Merge pull request #10521 from yahonda/sanitize_oracleRafael Mendonça França2013-05-081-5/+4
|\ \ \
| * | | Remove current_adapter? from test_sanitize_sql_hash_handles_associationsYasuo Honda2013-05-081-5/+4
* | | | adding more tests around callback inconsistenciesAaron Patterson2013-05-081-5/+47
* | | | refactor tests for more pointsAaron Patterson2013-05-081-4/+5
* | | | adding test to demonstrate inconsistencies in the AS::Callbacks apiAaron Patterson2013-05-081-0/+41
| |/ / |/| |
* | | Merge pull request #10519 from eiel/dependency-core_ext-hash-diffRafael Mendonça França2013-05-081-0/+2
|\ \ \
| * | | dependency ActiveSupport::DeprecationTomohiko Himura2013-05-091-0/+2
|/ / /
* | | Merge pull request #10511 from prathamesh-sonpatki/existentJosé Valim2013-05-073-4/+4
|\ \ \
| * | | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-083-4/+4
|/ / /
* | | Merge pull request #9522 from wangjohn/automatic_search_for_association_inversesJeremy Kemper2013-05-0711-10/+194
|\ \ \ | |_|/ |/| |
| * | Created a method to automatically find inverse associations and cachewangjohn2013-05-0711-10/+194
|/ /
* | Merge pull request #10506 from seanwalbran/fix-10502-skip-object-filterAaron Patterson2013-05-073-1/+28
|\ \
| * | add changelog entry for fix-10502-skip-object-filterSean Walbran2013-05-071-0/+5
| * | fix issue #10502, do not recompute method name for already-stringified object...Sean Walbran2013-05-072-1/+23
* | | Revert "Merge pull request #10455 from patricksrobertson/bigserial_id_not_ide...Aaron Patterson2013-05-072-35/+2
|/ /
* | Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pkAaron Patterson2013-05-072-2/+35
|\ \ | |/ |/|
| * Handle other pk types in PostgreSQL gracefully.Patrick Robertson2013-05-072-2/+35