aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when fa...Ben Woosley2013-05-102-0/+8
* Merge pull request #10558 from Empact/cleanup-finder-methodsRafael Mendonça França2013-05-104-28/+25
|\
| * Extract JoinDependency#join_relation to DRY the repeated application of the #...Ben Woosley2013-05-103-7/+9
| * In #apply_join_dependency, we can apply the #where in-place because relation ...Ben Woosley2013-05-101-1/+1
| * DRY-up join dependency creation by extracting construct_join_depdencyBen Woosley2013-05-101-7/+5
| * Pull the excepts into apply_join_dependency, for the sake of DRY.Ben Woosley2013-05-101-3/+4
| * Simplify conditions within apply_join_dependencyBen Woosley2013-05-101-9/+5
| * Move the except(:select) inside the construct_limited_ids_condition method to...Ben Woosley2013-05-101-2/+2
| * Reject blank order_values within #columns_for_distinct, as the orders aren't ...Ben Woosley2013-05-102-3/+3
|/
* Move #proxy_association method to AssociationRelationJon Leighton2013-05-103-4/+6
* Merge pull request #6792 from Empact/postgres-distinctJon Leighton2013-05-105-12/+61
|\
| * Fix that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"Ben Woosley2013-05-105-12/+61
* | Merge pull request #10553 from dasch/dasch/dont-try-to-explain-select_dbXavier Noria2013-05-102-1/+6
|\ \
| * | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+6
|/ /
* | 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