Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5649 from rafaelfranca/fix-delete_all | Aaron Patterson | 2012-04-10 | 4 | -17/+59 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix delete_all when chained with joins. | |||||
| * | | | | | Fix delete_all when chained with joins. | Rafael Mendonça França | 2012-04-10 | 4 | -17/+59 | |
|/ / / / / | | | | | | | | | | | | | | | | Closes #5202 and #919 | |||||
* | | | | | Merge pull request #5788 from Ask11/rails_new_help | Santiago Pastorino | 2012-04-09 | 2 | -3/+17 | |
|\ \ \ \ \ | | | | | | | | | | | | | "rails new -h" shows message in rails directory | |||||
| * | | | | | "rails new -h" shows message in rails directory | ask | 2012-04-09 | 2 | -3/+17 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5787 from frankieroberto/itemscope-patch | Santiago Pastorino | 2012-04-09 | 2 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding itemscope to list of boolean attributes. | |||||
| * | | | | | | Adding itemscope to list of boolean attributes. | Frankie Roberto | 2012-04-09 | 2 | -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 Noria | 2012-04-09 | 1 | -3/+4 | |
|/ / / / / | | | | | | | | | | | | | | | | Overview guide | |||||
* | | | | | Merge pull request #5783 from rafaelfranca/default_url_options | Santiago Pastorino | 2012-04-08 | 3 | -4/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Document that default_url_options must return a hash with symbolized keys | |||||
| * | | | | | Document that default_url_options must return a hash with symbolized | Rafael Mendonça França | 2012-04-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | keys | |||||
| * | | | | | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 3 | -4/+3 | |
| | | | | | | ||||||
* | | | | | | Revert "Merge pull request #5750 from ahoward/master" | Santiago Pastorino | 2012-04-08 | 2 | -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 methods | Santiago Pastorino | 2012-04-08 | 1 | -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.7 | Santiago Pastorino | 2012-04-08 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5718 from benedikt/master | Jeremy Kemper | 2012-04-08 | 4 | -6/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | Removes caching from ActiveRecord::Core::ClassMethods#relation | |||||
| * | | | | | Adds test to check that circular preloading does not modify Model.unscoped ↵ | Benedikt Deicke | 2012-04-03 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (as described in #5667) | |||||
| * | | | | | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-03 | 3 | -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 #5748 | Jeremy Kemper | 2012-04-08 | 2 | -8/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #5748 from ai/no_type_in_html5 | Jeremy Kemper | 2012-04-08 | 20 | -196/+196 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unnecessary in HTML 5 type attribute with default value | |||||
| * | | | | | Remove unnecessary in HTML 5 type attribute with default value | Andrey A.I. Sitnik | 2012-04-05 | 20 | -196/+196 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5773 from trevor/patch-1 | Vijay Dev | 2012-04-08 | 2 | -6/+6 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | url in comments - active_support/core_ext/integer/time.rb |