aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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)
* | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Removes caching from ActiveRecord::Core::ClassMethods#relation
| * | | | | Adds test to check that circular preloading does not modify Model.unscoped ↵Benedikt Deicke2012-04-033-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | (as described in #5667)
| * | | | | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-033-6/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"
* | | | | 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 value
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | url in comments - active_support/core_ext/integer/time.rb
| * | | | | | update stdlib doc urls in comments - ↵Trevor Wennblom2012-04-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active_support/core_ext/[integer|numeric]/time.rb http://stdlib.rubyonrails.org/ last updated in 2005
* | | | | | | adds a new test case for titleizeXavier Noria2012-04-081-0/+1
| | | | | | |
* | | | | | | Merge pull request #5759 from ↵Piotr Sarnacki2012-04-071-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | romanvbabenko/refactor/rails_module_singleton_class_varibles Class variables has been fixed to Singleton instance variables at Rails ...
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use extract_options! in cycle helper
| * | | | | | | use extract_options! in cycle helperSergey Nartimov2012-04-071-6/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | revises the regexp used in titleizeXavier Noria2012-04-072-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regexp used in titleize matches saxon genitive and other contractions, only to call capitalize on the captured text and have the apostrophe upcased which yields the apostrophe itself. It is more clear that the regexp matches just what it has to match.
* | | | | | | fix markup error [ci skip]Vijay Dev2012-04-081-1/+1
| | | | | | |
* | | | | | | avoid empty api pagesVijay Dev2012-04-083-4/+7
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-075-14/+29
|\ \ \ \ \ \
| * | | | | | Don't use arel_table in published_and_commented example in querying guideRyan Bigg2012-04-071-1/+1
| | | | | | |
| * | | | | | Revert "Documents that ActiveRecord instances also support []/[]= methods ↵Vijay Dev2012-04-071-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for reading/writing attributes" This reverts commit a49fe6ec2cb9f22a3b18d7db5ae2ee90325e9d09. Reason: The existing doc about using self[:attribute] is clear enough.
| * | | | | | Revert "Where migration can get wrong help added"Vijay Dev2012-04-071-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b11113f924d2eb2acbe836954d17a02163f45275.
| * | | | | | copy editing [ci skip]Vijay Dev2012-04-071-5/+4
| | | | | | |
| * | | | | | Fix example action dispatch in mime typeAlexey Vakhov2012-04-071-1/+1
| | | | | | |
| * | | | | | Documents that ActiveRecord instances also support []/[]= methods for ↵Rodrigo Rosenfeld Rosas2012-04-061-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading/writing attributes Only write_attribute and read_attribute were documented and there was no mention to this alternative.