aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4015 from schneems/schneems/routing_error_helpJosé Valim2011-12-171-8/+13
|\
| * add help text to routing errorschneems2011-12-171-8/+13
|/
* Add campfire notifications for travisSantiago Pastorino2011-12-171-0/+2
* Merge pull request #4012 from JustinCampbell/masterJosé Valim2011-12-172-1/+32
|\
| * Add test for register_aliasJustin Campbell2011-12-171-0/+9
| * Add test for type aliasesJustin Campbell2011-12-171-0/+11
| * Allow symbols to be passed for extension aliasesJustin Campbell2011-12-172-1/+12
* | Use gem versions of sass-rails and coffee-rails.José Valim2011-12-171-10/+26
* | Merge pull request #4010 from arunagw/fix_test_activemodelJosé Valim2011-12-171-1/+1
|\ \
| * | Fixed test "ArgumentError: wrong number of arguments(1 for 0)"Arun Agrawal2011-12-171-1/+1
|/ /
* | Merge pull request #4008 from arunagw/warning_variable_for_layoutJosé Valim2011-12-161-0/+1
|\ \ | |/ |/|
| * warning removed "warning: instance variable @variable_for_layout not initiali...Arun Agrawal2011-12-171-0/+1
|/
* Merge pull request #4007 from exviva/expand_cache_key_for_one_element_arrayJosé Valim2011-12-162-8/+16
|\
| * Fix expanding cache key for single element arraysOlek Janiszewski2011-12-162-8/+16
* | AS::Concern is not really needed for AR::ExplainXavier Noria2011-12-163-73/+71
* | Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2José Valim2011-12-162-1/+8
|\ \
| * | Fixed bug when error message is an empty string.Antonio Roberto2011-12-162-1/+8
* | | Merge pull request #3780 from marcbowes/masterVijay Dev2011-12-161-7/+3
|\ \ \
| * | | * A `/` is required if you want to explicitly skip the assets directory. This...Marc Bowes2011-11-281-7/+3
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-162-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge pull request #74 from abonec/masterAlexander2011-12-151-1/+1
| |\ \ \
| | * | | Update activerecord/lib/active_record/reflection.rbAlexander2011-12-141-1/+1
| * | | | escape assigns[:person], assigns[person] etc in actioncontroller testcaseNick Howard2011-12-141-3/+3
| |/ / /
* | | | Delete obsolete commentJon Leighton2011-12-161-1/+0
* | | | Fix the build on postgres. Note: we should probably actually make schema muta...Jon Leighton2011-12-161-1/+1
* | | | Should clear the primary keys cache alsoJon Leighton2011-12-162-1/+6
* | | | Don't store defaults in the schema cacheJon Leighton2011-12-164-6/+6
* | | | Defaults hash can go on the modelJon Leighton2011-12-162-15/+2
* | | | Cache columns at the model level.Jon Leighton2011-12-167-38/+43
* | | | Wait a full second so we have time for changes to propagateJosé Valim2011-12-161-0/+3
* | | | Fix failing asset test.José Valim2011-12-161-1/+3
* | | | Update CHANGELOGs and guides.José Valim2011-12-163-0/+6
* | | | Show detailed exceptions no longer returns true if the request is local in pr...José Valim2011-12-165-4/+23
* | | | Do not raise an exception if an invalid route was generated automatically.José Valim2011-12-163-4/+13
* | | | ShowExceptions should understand X-Cascade responses from exceptions app.José Valim2011-12-164-6/+27
* | | | Improve the specs on exceptions app.José Valim2011-12-163-3/+21
* | | | Allow a custom exceptions app to set.José Valim2011-12-163-2/+17
* | | | Extract the rendering of public exceptions pages into a Rack app.José Valim2011-12-167-45/+53
* | | | Get rid of the close checks since we cannot reliably close the session anyway.José Valim2011-12-167-165/+1
* | | | Merge pull request #4002 from arunagw/warning_removed_grouped_expressionPiotr Sarnacki2011-12-161-1/+1
|\ \ \ \
| * | | | Warning removed "warning: (...) interpreted as grouped expression"Arun Agrawal2011-12-161-1/+1
|/ / / /
* | | | removes Ruby constraint in RedCloth dependencyXavier Noria2011-12-151-1/+1
* | | | it's -> itsXavier Noria2011-12-151-1/+1
* | | | Move DefaultScope and NamedScope under ScopingJon Leighton2011-12-157-342/+357
* | | | Let AttributeMethods do its own including etcJon Leighton2011-12-153-21/+25
* | | | Split out most of the AR::Base code into separate modules :cake:Jon Leighton2011-12-1519-1658/+1781
* | | | Set up delegations also for to_a and arel branches.José Valim2011-12-152-9/+9
* | | | Move delegation reponsibilities of Relation to a module. Also precompile meth...José Valim2011-12-153-22/+44
* | | | Make with_scope public so we stop using send :bomb:José Valim2011-12-153-91/+104
* | | | Merge pull request #3998 from rafacv/masterXavier Noria2011-12-151-1/+1
|\ \ \ \