aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Add some documentation for AM.mailer_namePrem Sichanugrist2013-05-031-0/+2
| * replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| * Capitalizing internet to Internet. [ci skip]Akshay Khole2013-05-032-2/+2
| * added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| * Simple grammar updatesJonathan Roes2013-05-031-2/+2
| * fix typoVipul A M2013-05-021-1/+1
| * document String#to_time exceptionVipul A M2013-05-021-0/+1
| * Clean up the wording in a few placesJonathan Roes2013-05-011-4/+4
| * Add a few overview bullet pointsJonathan Roes2013-05-011-0/+4
| * Fix typo "can exploited" with "can be exploited"Leo Gallucci2013-05-011-1/+1
| * Rails 4 has deprecated :order in has_many to use a lambda instead, update the...Nick Quaranto2013-05-011-1/+1
* | Merge pull request #10576 from sferik/remove_multi_json_dependencyYehuda Katz2013-05-114-46/+19
|\ \
| * | Replace multi_json with jsonErik Michaels-Ober2013-05-114-46/+19
|/ /
* | Merge pull request #10574 from wangjohn/automatic_inverse_of_documentationRafael Mendonça França2013-05-113-1/+33
|\ \
| * | Adding documentation to the automatic inverse_of finder.wangjohn2013-05-113-1/+33
|/ /
* | Improve CHANGELOG entry [ci kip]Rafael Mendonça França2013-05-111-6/+10
* | Merge pull request #10503 from kstevens715/masterRafael Mendonça França2013-05-113-1/+32
|\ \
| * | Call assume_migrated_upto_version on connectionKyle Stevens2013-05-113-1/+32
|/ /
* | Merge pull request #10567 from neerajdotname/read_attribute_before_type_cast_...Rafael Mendonça França2013-05-113-1/+7
|\ \
| * | read_attribute_before_type_cast should accept symbolNeeraj Singh2013-05-113-1/+7
* | | Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-keyRafael Mendonça França2013-05-111-2/+1
* | | Merge pull request #10568 from siong1987/minor-refactoringXavier Noria2013-05-111-5/+0
|\ \ \ | |/ / |/| |
| * | Clean up unused method for `rake doc`.Teng Siong Ong2013-05-111-5/+0
|/ /
* | Merge branch 'fix-json-encoding'Rafael Mendonça França2013-05-103-5/+18
|\ \
| * | Give credits to all the envolved people [ci skip]Rafael Mendonça França2013-05-101-1/+1
| * | Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-103-3/+12
| |\ \
| | * | Added escaping of U+2028 and U+2029 inside the json encoder.Mario Caropreso2013-05-093-5/+14
| * | | Fix syntax error on Ruby 2.0Rafael Mendonça França2013-05-101-2/+4
| * | | Merge pull request #10057 from zackham/patch-1Rafael Mendonça França2013-05-101-2/+4
|/| | |
| * | | Escape multibyte line terminators in JSON encodingzackham2013-04-021-2/+4
* | | | 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