aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo on the add_index.kennyj2012-04-131-1/+1
|
* 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
| | | | | | | | Could also be worded 'as an option', but plural made more sense given the mention of ':handlers and :formats'.
| * copy editing [ci skip]Vijay Dev2012-04-111-3/+2
| |
| * Revert "add instructions for adding additional manifests"Vijay Dev2012-04-111-5/+1
| | | | | | | | | | | | This reverts commit f28f1d70b3f3dd9f694067f7cab2e717e302ee2b. Reason: This is already covered in this guide elsewhere.
| * 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
|\ \ | | | | | | Improve the performance of #delegate
| * | 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
| | | | | | | | | | | | | | | | | | 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_associationJon Leighton2012-04-123-8/+7
|\ \ \ | | | | | | | | Some refactor for association.
| * | | Some refactor for association.kennyj2012-04-123-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_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 method FormBuilder#index
| * | Add index method to FormBuilder. Useful when you use field_for and need to ↵Jorge Bejar2012-04-113-5/+74
| | | | | | | | | | | | know the index number into the iteration.
* | | Merge pull request #5736 from oscardelben/configuration_errors_reportingJon Leighton2012-04-111-3/+3
|\ \ \ | | | | | | | | Add better errors reporting for ActiveModel::Configuration
| * | | 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.
| * | | | 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.
| * | | | | Override AR::Relation methods in NullRelation.Juanjo Bazán2012-04-112-0/+86
| | | | | | | | | | | | | | | | | | So a NullRelation (Relation#none) is chainable with database methods.
* | | | | | Merge pull request #5792 from lest/patch-4Xavier Noria2012-04-111-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | no need in temporary array in number_to_phone helper
| * | | | | no need in temporary array in number_to_phone helperSergey Nartimov2012-04-091-2/+2
| | | | | |
* | | | | | Merge pull request #5805 from dcurtis/masterXavier Noria2012-04-112-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Corrected grammatical errors in schema_dumper and scoping/default
| * | | | | | Corrected grammatical errors in schema_dumper and scoping/defaultdcurtis2012-04-102-2/+2
|/ / / / / /
* | | | | | Merge pull request #5649 from rafaelfranca/fix-delete_allAaron Patterson2012-04-104-17/+59
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix delete_all when chained with joins.
| * | | | | Fix delete_all when chained with joins.Rafael Mendonça França2012-04-104-17/+59
|/ / / / / | | | | | | | | | | | | | | | Closes #5202 and #919
* | | | | Merge pull request #5788 from Ask11/rails_new_helpSantiago Pastorino2012-04-092-3/+17
|\ \ \ \ \ | | | | | | | | | | | | "rails new -h" shows message in rails directory
| * | | | | "rails new -h" shows message in rails directoryask2012-04-092-3/+17
| | | | | |
* | | | | | Merge pull request #5787 from frankieroberto/itemscope-patchSantiago Pastorino2012-04-092-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding itemscope to list of boolean attributes.
| * | | | | | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-092-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope
* / / / / / rewords the section about default_url_options in the Action Controller ↵Xavier Noria2012-04-091-3/+4
|/ / / / / | | | | | | | | | | | | | | | Overview guide
* | | | | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-083-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Document that default_url_options must return a hash with symbolized keys
| * | | | | Document that default_url_options must return a hash with symbolizedRafael Mendonça França2012-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | keys
| * | | | | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-083-4/+3
| | | | | |
* | | | | | Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-082-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a. The reverted commit improved the performance in the wrong place, now we have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.
* | | | | | Inline the symbolize_keys/stringify_keys methodsSantiago Pastorino2012-04-081-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user system total real symbolize_keys 5.980000 0.070000 6.050000 ( 6.048187) new_symbolize_keys 4.310000 0.050000 4.360000 ( 4.364745)