aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-codeJon Leighton2012-04-131-3/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
* | | | | | | | | | | | doesn't make sense for select! to take a blockJon Leighton2012-04-131-8/+3
* | | | | | | | | | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-134-9/+15
* | | | | | | | | | | | Make Relation#extending work like other value methodsJon Leighton2012-04-135-27/+22
* | | | | | | | | | | | Add Relation#merge!Jon Leighton2012-04-132-9/+17
* | | | | | | | | | | | assert valid keysJon Leighton2012-04-133-0/+11
* | | | | | | | | | | | Allow Relation#merge to take a hashJon Leighton2012-04-134-49/+95
* | | | | | | | | | | | we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-134-15/+11
* | | | | | | | | | | | we don't need to test that constant assignment worksJon Leighton2012-04-131-15/+0
* | | | | | | | | | | | refactoringJon Leighton2012-04-131-36/+45
* | | | | | | | | | | | Extract clusterfuck method for surgeryJon Leighton2012-04-132-71/+92
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #5830 from raganwald/masterXavier Noria2012-04-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | mention that coercion only happens when the primary key is an integer and use...Reg Braithwaite2012-04-121-2/+2
| * | | | | | | | | | Documents that ActiveRecord's find by id uses to_i to coerce its arguments to...Reg Braithwaite2012-04-121-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Add bang versions of relation query methods.Jon Leighton2012-04-123-84/+194
* | | | | | | | | | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...Jeremy Kemper2012-04-121-1/+21
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-126-8/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed markup in security guideAlfonso Cora2012-04-121-1/+1
| * | | | | | | | | Grammar fix in 3.2 Release Notes guide Tim Harvey2012-04-111-1/+1
| * | | | | | | | | copy editing [ci skip]Vijay Dev2012-04-111-3/+2
| * | | | | | | | | Revert "add instructions for adding additional manifests"Vijay Dev2012-04-111-5/+1
| * | | | | | | | | fix bad format [ci skip]Vijay Dev2012-04-111-1/+1
| * | | | | | | | | Fix small markup error; fix incorrect linkJonathan Mazin2012-04-091-2/+2
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsPatrick Sharp2012-04-091-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix code example in generator test casePrem Sichanugrist2012-04-091-2/+2
| * | | | | | | | | | add instructions for adding additional manifestsPatrick Sharp2012-04-091-1/+5
| |/ / / / / / / / /
| * | | | | | | | | Added instructions on port numberGaurish Sharma2012-04-091-0/+4
| * | | | | | | | | fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callbackJan Xie2012-04-081-1/+1
* | | | | | | | | | avoid autolinking by rdoc [ci skip]Vijay Dev2012-04-121-2/+2
* | | | | | | | | | Merge pull request #2733 from dasch/improve-delegateJon Leighton2012-04-123-10/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove the addition to the guidesDaniel Schierbeck2012-04-121-20/+0
| * | | | | | | | | | Add changelog entryDaniel Schierbeck2012-04-121-0/+2
| * | | | | | | | | | Remove Module#delegate!Daniel Schierbeck2012-04-121-52/+0
| * | | | | | | | | | Add back the old `deprecate` method as `deprecate!`Daniel Schierbeck2012-04-121-0/+52
| * | | | | | | | | | Document the changes to delegate in the guidesDaniel Schierbeck2012-04-121-0/+20
| * | | | | | | | | | Change API docs regarding delegation to non-public methodsDaniel Schierbeck2012-04-121-1/+1
| * | | | | | | | | | Optimize the performance of #delegateDaniel Schierbeck2012-04-122-9/+32
* | | | | | | | | | | Merge pull request #5722 from kennyj/some_refactor_for_associationJon Leighton2012-04-123-8/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Some refactor for association.kennyj2012-04-123-8/+7
|/ / / / / / / / / / /
* | | | | | | | | | | move apply_finder_options to active_record_deprecated_findersJon Leighton2012-04-121-22/+0
* | | | | | | | | | | add active_record_deprecated_finders as a depJon Leighton2012-04-123-0/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-113-5/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add index method to FormBuilder. Useful when you use field_for and need to kn...Jorge Bejar2012-04-113-5/+74
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5736 from oscardelben/configuration_errors_reportingJon Leighton2012-04-111-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add better errors reporting for ActiveModel::ConfigurationOscar Del Ben2012-04-041-3/+3
* | | | | | | | | | | Merge pull request #5720 from kennyj/should_use_klass_methodJon Leighton2012-04-112-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Get a properly aliased_table_name, when we use a polymorphic association.kennyj2012-04-042-1/+2
* | | | | | | | | | | | Merge pull request #5809 from xuanxu/null_relation_methodsJon Leighton2012-04-112-0/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Override AR::Relation methods in NullRelation.Juanjo Bazán2012-04-112-0/+86