Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #4010 from arunagw/fix_test_activemodel | José Valim | 2011-12-17 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fixed test "ArgumentError: wrong number of arguments(1 for 0)" | |||||
| * | | | | Fixed test "ArgumentError: wrong number of arguments(1 for 0)" | Arun Agrawal | 2011-12-17 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #4008 from arunagw/warning_variable_for_layout | José Valim | 2011-12-16 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | warning removed "warning: instance variable @variable_for_layout not ini... | |||||
| * | | | warning removed "warning: instance variable @variable_for_layout not ↵ | Arun Agrawal | 2011-12-17 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | initialized" | |||||
* | | | Merge pull request #4007 from exviva/expand_cache_key_for_one_element_array | José Valim | 2011-12-16 | 2 | -8/+16 | |
|\ \ \ | | | | | | | | | Fix expanding cache key for single element arrays | |||||
| * | | | Fix expanding cache key for single element arrays | Olek Janiszewski | 2011-12-16 | 2 | -8/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In short: expand_cache_key(element) should not equal expand_cache_key([element]) This way a fragment cache key for an index page with only a single element in the collection is different than a fragment cache for a typical show page for that element. | |||||
* | | | | AS::Concern is not really needed for AR::Explain | Xavier Noria | 2011-12-16 | 3 | -73/+71 | |
| | | | | ||||||
* | | | | Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2 | José Valim | 2011-12-16 | 2 | -1/+8 | |
|\ \ \ \ | | | | | | | | | | | Fixed bug when error message is an empty string. | |||||
| * | | | | Fixed bug when error message is an empty string. | Antonio Roberto | 2011-12-16 | 2 | -1/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #3780 from marcbowes/master | Vijay Dev | 2011-12-16 | 1 | -7/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix favicon_link_tag help text | |||||
| * | | | | | * A `/` is required if you want to explicitly skip the assets directory. ↵ | Marc Bowes | 2011-11-28 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important because `public/assets` is typically git-ignored. * The asset id is no longer generated. | |||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-16 | 2 | -4/+4 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Merge pull request #74 from abonec/master | Alexander | 2011-12-15 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed typo in comments | |||||
| | * | | | | | Update activerecord/lib/active_record/reflection.rb | Alexander | 2011-12-14 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | escape assigns[:person], assigns[person] etc in actioncontroller testcase | Nick Howard | 2011-12-14 | 1 | -3/+3 | |
| |/ / / / / | ||||||
* | | | | | | Delete obsolete comment | Jon Leighton | 2011-12-16 | 1 | -1/+0 | |
| | | | | | | ||||||
* | | | | | | Fix the build on postgres. Note: we should probably actually make schema ↵ | Jon Leighton | 2011-12-16 | 1 | -1/+1 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | mutations bust the cache. | |||||
* | | | | | Should clear the primary keys cache also | Jon Leighton | 2011-12-16 | 2 | -1/+6 | |
| | | | | | ||||||
* | | | | | Don't store defaults in the schema cache | Jon Leighton | 2011-12-16 | 4 | -6/+6 | |
| | | | | | ||||||
* | | | | | Defaults hash can go on the model | Jon Leighton | 2011-12-16 | 2 | -15/+2 | |
| | | | | | ||||||
* | | | | | Cache columns at the model level. | Jon Leighton | 2011-12-16 | 7 | -38/+43 | |
| | | | | | | | | | | | | | | | | | | | | Allows two models to use the same table but have different primary keys. | |||||
* | | | | | Wait a full second so we have time for changes to propagate | José Valim | 2011-12-16 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Fix failing asset test. | José Valim | 2011-12-16 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Update CHANGELOGs and guides. | José Valim | 2011-12-16 | 3 | -0/+6 | |
| | | | | | ||||||
* | | | | | Show detailed exceptions no longer returns true if the request is local in ↵ | José Valim | 2011-12-16 | 5 | -4/+23 | |
| | | | | | | | | | | | | | | | | | | | | production. | |||||
* | | | | | Do not raise an exception if an invalid route was generated automatically. | José Valim | 2011-12-16 | 3 | -4/+13 | |
| | | | | | ||||||
* | | | | | ShowExceptions should understand X-Cascade responses from exceptions app. | José Valim | 2011-12-16 | 4 | -6/+27 | |
| | | | | | ||||||
* | | | | | Improve the specs on exceptions app. | José Valim | 2011-12-16 | 3 | -3/+21 | |
| | | | | | ||||||
* | | | | | Allow a custom exceptions app to set. | José Valim | 2011-12-16 | 3 | -2/+17 | |
| | | | | | ||||||
* | | | | | Extract the rendering of public exceptions pages into a Rack app. | José Valim | 2011-12-16 | 7 | -45/+53 | |
| | | | | | ||||||
* | | | | | Get rid of the close checks since we cannot reliably close the session anyway. | José Valim | 2011-12-16 | 7 | -165/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #4002 from arunagw/warning_removed_grouped_expression | Piotr Sarnacki | 2011-12-16 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Warning removed "warning: (...) interpreted as grouped expression" | |||||
| * | | | | | Warning removed "warning: (...) interpreted as grouped expression" | Arun Agrawal | 2011-12-16 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | removes Ruby constraint in RedCloth dependency | Xavier Noria | 2011-12-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | it's -> its | Xavier Noria | 2011-12-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Move DefaultScope and NamedScope under Scoping | Jon Leighton | 2011-12-15 | 7 | -342/+357 | |
| | | | | | ||||||
* | | | | | Let AttributeMethods do its own including etc | Jon Leighton | 2011-12-15 | 3 | -21/+25 | |
| | | | | | ||||||
* | | | | | Split out most of the AR::Base code into separate modules :cake: | Jon Leighton | 2011-12-15 | 19 | -1658/+1781 | |
| | | | | | ||||||
* | | | | | Set up delegations also for to_a and arel branches. | José Valim | 2011-12-15 | 2 | -9/+9 | |
| | | | | | ||||||
* | | | | | Move delegation reponsibilities of Relation to a module. Also precompile ↵ | José Valim | 2011-12-15 | 3 | -22/+44 | |
| | | | | | | | | | | | | | | | | | | | | method missing calls for rofscale. | |||||
* | | | | | Make with_scope public so we stop using send :bomb: | José Valim | 2011-12-15 | 3 | -91/+104 | |
| | | | | | ||||||
* | | | | | Merge pull request #3998 from rafacv/master | Xavier Noria | 2011-12-15 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Small typo in Rails::Engine documentation | |||||
| * | | | | | Fixed small typo in the Rails::Engine documentation. | Rafael Valverde | 2011-12-15 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Improve delegate list to avoid method missing. | José Valim | 2011-12-15 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Fix diagnostics page for routing errors. | José Valim | 2011-12-15 | 6 | -16/+28 | |
| | | | | | ||||||
* | | | | | Clean up the cache before the request in case we are running in the ↵ | José Valim | 2011-12-15 | 5 | -12/+66 | |
| | | | | | | | | | | | | | | | | | | | | reload_classes_only_on_change schema. | |||||
* | | | | | There isn't a column_hash. It was being invoked by method missing. | José Valim | 2011-12-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix #3987. | Jon Leighton | 2011-12-15 | 2 | -0/+12 | |
| | | | | | ||||||
* | | | | | Merge pull request #3994 from whilefalse/sass_cache_gitignore | José Valim | 2011-12-15 | 1 | -1/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added .sass-cache/ directory to the genrated gitignore in engines. | |||||
| * | | | | | Added .sass-cache/ directory to the genrated gitignore in engines. | Steven Anderson | 2011-12-15 | 1 | -1/+2 | |
| | | | | | |