aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | added more info about << operation in associationsNeeraj Singh2010-07-061-0/+4
| | |/
| | * clarifying the comments regarding base_class declarationNeeraj Singh2010-07-011-2/+4
| | * Added documentation for usage of associative resources with form_forRizwan Reza2010-07-011-1/+11
| | * Fixes README for generated apps with Rails 3 (rails *new* myapp, and Welcome ...Jaime Iniesta2010-07-012-3/+3
| * | Add a test to ensure url helpers are not action methods in ActionMailer.José Valim2010-07-071-0/+19
| * | When a dynamic :controller segment is present in the path add a Regexp constr...Andrew White2010-07-073-21/+46
| * | Refactor handling of :only and :except options. The rules are:Andrew White2010-07-062-73/+236
| * | documents automatic management of join models in hmt associations, in particu...Xavier Noria2010-07-062-4/+21
| * | Recognize should also work with route is wrapped in a constraint.José Valim2010-07-063-1/+8
| * | RouteSet should also handle anonymous classes.José Valim2010-07-051-2/+2
| * | Define a convention for descendants and subclasses.José Valim2010-07-0513-192/+100
| * | Move Date#xmlschema to conversions and add a missing requireSantiago Pastorino2010-07-043-9/+12
| * | Avoids deprecation warning running testsSantiago Pastorino2010-07-041-5/+7
| * | Adds tests for content negotiation change introduced in dc5300adb6d46252c26ePatrik Stenmark2010-07-041-0/+20
| * | ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will always be ...Madjo DIAPENA2010-07-041-1/+1
| * | Fix syntax of routing tests so they actually runAndrew White2010-07-041-12/+18
| * | Refactor resource options and scoping. Resource classes are now only responsi...Andrew White2010-07-042-101/+145
| * | Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-037-9/+9
| * | Merge remote branch 'spastorino/master'Jeremy Kemper2010-07-0311-30/+40
| |\ \
| | * | Add a missing require to allow the usage of Array#to_xmlSantiago Pastorino2010-07-031-0/+1
| | * | Removes the dependency that AMo has on tzinfoSantiago Pastorino2010-07-031-6/+6
| | * | Refactor move some date, time and date_time methods to */zones and fixed some...Santiago Pastorino2010-07-039-24/+33
| * | | Refactor recall parameter normalization [#5021 state:resolved]Andrew White2010-07-032-18/+33
| |/ /
| * | Time#formatted_offset is defined in core_ext/time/conversionsSantiago Pastorino2010-07-021-0/+1
| * | Time#as_json: use Time#formatted_offset instead of strftime %z directive, whi...Geoff Buesing2010-07-021-1/+1
| * | Fix indentJeremy Kemper2010-07-021-1/+1
| * | Fix routes with :controller segment when namespaced [#5034 state:resolved]José Valim2010-07-024-30/+63
| * | reload_routes! was still referencing old Rails::Application.José Valim2010-07-021-6/+5
| * | bump erubis version to 2.6.6 and thor version to 0.13.7Santiago Pastorino2010-07-023-4/+4
| * | Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfoSantiago Pastorino2010-07-023-4/+7
| * | Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-0215-37/+37
| * | porting session.clear fix to master branch. [#5030 state:resolved]Aaron Patterson2010-07-012-0/+27
| * | AS json refactor, move to_json implementation to core_ext and a cleanup a bit...Santiago Pastorino2010-07-016-36/+29
| * | Bump bundler dependency to 1.0.0.beta.2 or laterJeremy Kemper2010-07-013-2/+3
| * | Avoid calls to Rails::Application since this is not the official API.José Valim2010-07-0117-80/+55
| * | fix failure if behavior is not define and try use the defaultCyril Mougel2010-07-012-1/+8
| * | Add the possibility to have several behaviors in AS::Deprecation.José Valim2010-07-014-3/+19
| * | Don't remove scheduled destroys when loading an association. [#4642 state:res...James Le Cuirot2010-07-012-1/+12
| * | Make relation a private method.José Valim2010-07-012-6/+7
| |/
* | Merge branch 'master' of http://github.com/rails/railsGonçalo Silva2010-06-30437-4334/+10662
|\|
| * Merge remote branch 'rails/master'Xavier Noria2010-06-30126-970/+5690
| |\
| | * Support any mysql-like adapterJeremy Kemper2010-06-301-7/+7
| | * add note of which configuration option to set in deprecation warning message ...bodhi2010-06-301-3/+5
| | * Improve the idiom used in multibyte chars a bit.José Valim2010-06-301-3/+3
| | * Fix ActiveSupport::Multibyte::Chars#slice for empty strings when starting off...Alex Muntean2010-06-302-1/+3
| | * Update Unicode database to 5.2.0. [#5011 state:resolved]Norman Clarke2010-06-302-1/+1
| | * Fix AS::MB::Chars#+ to not alter self [#4646 state:resolved]James MacAulay2010-06-302-8/+10
| | * Add missing CHANGELOG items.José Valim2010-06-301-0/+2
| | * A couple enhancements to the router:José Valim2010-06-302-27/+75
| | * Clean up the logic to specify the name and path for action a bit.José Valim2010-06-301-87/+51