Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make Relation#extending work like other value methods | Jon Leighton | 2012-04-13 | 5 | -27/+22 |
| | |||||
* | Add Relation#merge! | Jon Leighton | 2012-04-13 | 2 | -9/+17 |
| | |||||
* | assert valid keys | Jon Leighton | 2012-04-13 | 3 | -0/+11 |
| | |||||
* | Allow Relation#merge to take a hash | Jon Leighton | 2012-04-13 | 4 | -49/+95 |
| | |||||
* | we have no need for the ASSOCIATION_METHODS constant | Jon Leighton | 2012-04-13 | 4 | -15/+11 |
| | |||||
* | we don't need to test that constant assignment works | Jon Leighton | 2012-04-13 | 1 | -15/+0 |
| | |||||
* | refactoring | Jon Leighton | 2012-04-13 | 1 | -36/+45 |
| | |||||
* | Extract clusterfuck method for surgery | Jon Leighton | 2012-04-13 | 2 | -71/+92 |
| | |||||
* | Merge pull request #5830 from raganwald/master | Xavier Noria | 2012-04-12 | 1 | -1/+3 |
|\ | | | | | Update RDoc to mention integer coercion in ActiveRecord’s find by id | ||||
| * | mention that coercion only happens when the primary key is an integer and ↵ | Reg Braithwaite | 2012-04-12 | 1 | -2/+2 |
| | | | | | | | | use +to_i+ formatting | ||||
| * | Documents that ActiveRecord's find by id uses to_i to coerce its arguments ↵ | Reg Braithwaite | 2012-04-12 | 1 | -1/+3 |
|/ | | | | to integers | ||||
* | Add bang versions of relation query methods. | Jon Leighton | 2012-04-12 | 3 | -84/+194 |
| | | | | | The main reason for this is that I want to separate the code that does the mutating from the code that does the cloning. | ||||
* | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so ↵ | Jeremy Kemper | 2012-04-12 | 1 | -1/+21 |
| | | | | opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-12 | 6 | -8/+11 |
|\ | |||||
| * | Fixed markup in security guide | Alfonso Cora | 2012-04-12 | 1 | -1/+1 |
| | | |||||
| * | Grammar fix in 3.2 Release Notes guide | Tim Harvey | 2012-04-11 | 1 | -1/+1 |
| | | | | | | | | Could also be worded 'as an option', but plural made more sense given the mention of ':handlers and :formats'. | ||||
| * | copy editing [ci skip] | Vijay Dev | 2012-04-11 | 1 | -3/+2 |
| | | |||||
| * | Revert "add instructions for adding additional manifests" | Vijay Dev | 2012-04-11 | 1 | -5/+1 |
| | | | | | | | | | | | | This reverts commit f28f1d70b3f3dd9f694067f7cab2e717e302ee2b. Reason: This is already covered in this guide elsewhere. | ||||
| * | fix bad format [ci skip] | Vijay Dev | 2012-04-11 | 1 | -1/+1 |
| | | |||||
| * | Fix small markup error; fix incorrect link | Jonathan Mazin | 2012-04-09 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Patrick Sharp | 2012-04-09 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix code example in generator test case | Prem Sichanugrist | 2012-04-09 | 1 | -2/+2 |
| | | | |||||
| * | | add instructions for adding additional manifests | Patrick Sharp | 2012-04-09 | 1 | -1/+5 |
| |/ | |||||
| * | Added instructions on port number | Gaurish Sharma | 2012-04-09 | 1 | -0/+4 |
| | | |||||
| * | fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callback | Jan Xie | 2012-04-08 | 1 | -1/+1 |
| | | |||||
* | | avoid autolinking by rdoc [ci skip] | Vijay Dev | 2012-04-12 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2733 from dasch/improve-delegate | Jon Leighton | 2012-04-12 | 3 | -10/+35 |
|\ \ | | | | | | | Improve the performance of #delegate | ||||
| * | | Remove the addition to the guides | Daniel Schierbeck | 2012-04-12 | 1 | -20/+0 |
| | | | |||||
| * | | Add changelog entry | Daniel Schierbeck | 2012-04-12 | 1 | -0/+2 |
| | | | |||||
| * | | Remove Module#delegate! | Daniel Schierbeck | 2012-04-12 | 1 | -52/+0 |
| | | | |||||
| * | | Add back the old `deprecate` method as `deprecate!` | Daniel Schierbeck | 2012-04-12 | 1 | -0/+52 |
| | | | |||||
| * | | Document the changes to delegate in the guides | Daniel Schierbeck | 2012-04-12 | 1 | -0/+20 |
| | | | |||||
| * | | Change API docs regarding delegation to non-public methods | Daniel Schierbeck | 2012-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Optimize the performance of #delegate | Daniel Schierbeck | 2012-04-12 | 2 | -9/+32 |
| | | | | | | | | | | | | | | | | | | Remove the use of #__send__ in order to boost performance. This also means that you can no longer delegate to private methods on the target object. | ||||
* | | | Merge pull request #5722 from kennyj/some_refactor_for_association | Jon Leighton | 2012-04-12 | 3 | -8/+7 |
|\ \ \ | | | | | | | | | Some refactor for association. | ||||
| * | | | Some refactor for association. | kennyj | 2012-04-12 | 3 | -8/+7 |
|/ / / | | | | | | | | | | | | | | | | | | | * Remove unused association_class method. * Remove a unnecessary assignment. * Move @updated to BelongsToAssociation that only reference this instance variable. * Reset @stale_state at the reset method. I think this place is right place. | ||||
* | | | move apply_finder_options to active_record_deprecated_finders | Jon Leighton | 2012-04-12 | 1 | -22/+0 |
| | | | |||||
* | | | add active_record_deprecated_finders as a dep | Jon Leighton | 2012-04-12 | 3 | -0/+9 |
|/ / | |||||
* | | Merge pull request #5746 from jmbejar/index_method_form_builder | Santiago Pastorino | 2012-04-11 | 3 | -5/+74 |
|\ \ | | | | | | | Add method FormBuilder#index | ||||
| * | | Add index method to FormBuilder. Useful when you use field_for and need to ↵ | Jorge Bejar | 2012-04-11 | 3 | -5/+74 |
| | | | | | | | | | | | | know the index number into the iteration. | ||||
* | | | Merge pull request #5736 from oscardelben/configuration_errors_reporting | Jon Leighton | 2012-04-11 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Add better errors reporting for ActiveModel::Configuration | ||||
| * | | | Add better errors reporting for ActiveModel::Configuration | Oscar Del Ben | 2012-04-04 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #5720 from kennyj/should_use_klass_method | Jon Leighton | 2012-04-11 | 2 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Get a properly aliased_table_name, when we use a polymorphic association. | ||||
| * | | | | Get a properly aliased_table_name, when we use a polymorphic association. | kennyj | 2012-04-04 | 2 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #5809 from xuanxu/null_relation_methods | Jon Leighton | 2012-04-11 | 2 | -0/+86 |
|\ \ \ \ \ | | | | | | | | | | | | | Override AR::Relation methods in NullRelation. | ||||
| * | | | | | Override AR::Relation methods in NullRelation. | Juanjo Bazán | 2012-04-11 | 2 | -0/+86 |
| | | | | | | | | | | | | | | | | | | So a NullRelation (Relation#none) is chainable with database methods. | ||||
* | | | | | | Merge pull request #5792 from lest/patch-4 | Xavier Noria | 2012-04-11 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | no need in temporary array in number_to_phone helper | ||||
| * | | | | | no need in temporary array in number_to_phone helper | Sergey Nartimov | 2012-04-09 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #5805 from dcurtis/master | Xavier Noria | 2012-04-11 | 2 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Corrected grammatical errors in schema_dumper and scoping/default | ||||
| * | | | | | | Corrected grammatical errors in schema_dumper and scoping/default | dcurtis | 2012-04-10 | 2 | -2/+2 |
|/ / / / / / |