aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #5792 from lest/patch-4Xavier Noria2012-04-111-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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/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.Rafael Mendonça França2012-04-104-17/+59
|/ / / /
* | | | Merge pull request #5788 from Ask11/rails_new_helpSantiago Pastorino2012-04-092-3/+17
|\ \ \ \
| * | | | "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.Frankie Roberto2012-04-092-3/+3
| |/ / / /
* / / / / rewords the section about default_url_options in the Action Controller Overvi...Xavier Noria2012-04-091-3/+4
|/ / / /
* | | | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-083-4/+4
|\ \ \ \
| * | | | Document that default_url_options must return a hash with symbolizedRafael Mendonça França2012-04-091-0/+1
| * | | | 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
* | | | | Inline the symbolize_keys/stringify_keys methodsSantiago Pastorino2012-04-081-2/+10
* | | | | Remove Fixnum#to_sym support in 1.8.7Santiago Pastorino2012-04-081-1/+1
|/ / / /
* | | | Merge pull request #5718 from benedikt/masterJeremy Kemper2012-04-084-6/+13
|\ \ \ \
| * | | | Adds test to check that circular preloading does not modify Model.unscoped (a...Benedikt Deicke2012-04-033-4/+8
| * | | | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-033-6/+9
| |/ / /
* | | | Fix a couple more script[type=text/javascript] tests affected by #5748Jeremy Kemper2012-04-082-8/+8
* | | | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-0820-196/+196
|\ \ \ \
| * | | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-0520-196/+196
* | | | | Merge pull request #5773 from trevor/patch-1Vijay Dev2012-04-082-6/+6
|\ \ \ \ \
| * | | | | update stdlib doc urls in comments - active_support/core_ext/[integer|numeric...Trevor Wennblom2012-04-072-6/+6
* | | | | | adds a new test case for titleizeXavier Noria2012-04-081-0/+1
* | | | | | Merge pull request #5759 from romanvbabenko/refactor/rails_module_singleton_c...Piotr Sarnacki2012-04-071-7/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Class variables has been fixed to Singleton instance variables at Rails moduleRoman V. Babenko2012-04-061-7/+7
* | | | | | Merge pull request #5772 from lest/patch-4Xavier Noria2012-04-071-6/+4
|\ \ \ \ \ \