Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | ensuring that documentation does not exceed 100 columns | Neeraj Singh | 2010-07-31 | 1 | -51/+65 | |
| | | | ||||||
| * | | adding the missing closing tag | Neeraj Singh | 2010-07-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | fixing documentation just a little bit | Neeraj Singh | 2010-07-31 | 2 | -22/+16 | |
| | | | ||||||
| | * | skip the before_type_cast_on_datetime test entirely for mysql2 | Brian Lopez | 2010-08-02 | 1 | -17/+18 | |
| | | | ||||||
| | * | move reload after touch | Brian Lopez | 2010-08-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | reload the owner model after update | Brian Lopez | 2010-08-02 | 1 | -0/+1 | |
| | | | ||||||
| | * | Merge branch 'master' into mysql2 | Brian Lopez | 2010-08-02 | 30 | -56/+291 | |
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Bring returning back to ease migration. Remove duplicated logic. Eager loading an association should not change the count of children fix loading of different elements in array then int and string [#5036 state:resolved] Tidy up previous commit. test and fix collection_singular_ids= with string primary keys [#5125 state:resolved] Handle edge cases in the previous patch. Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved] Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:resolved] Add an internal (private API) after_touch callback. [#5271 state:resolved] added failing touch propagation test Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax Failing test to check for route file corruption if legacy map parameter is used. [#5263 state:open] Corrected the rake test:units and test:functionals description [#5251 state:committed] Use AS::OrderedHash when trusting in the order of the hash Fix label form helper to use I18n and html options, without the need of 'nil' text param: | |||||
* | | | Bring returning back to ease migration. | José Valim | 2010-08-02 | 2 | -0/+44 | |
| | | | ||||||
* | | | Remove duplicated logic. | José Valim | 2010-08-02 | 1 | -7/+9 | |
| | | | ||||||
* | | | Eager loading an association should not change the count of children | Neeraj Singh | 2010-08-02 | 6 | -0/+42 | |
| | | | | | | | | | | | | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | fix loading of different elements in array then int and string [#5036 ↵ | Josef Reidinger | 2010-08-02 | 2 | -3/+15 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Tidy up previous commit. | José Valim | 2010-08-02 | 3 | -18/+16 | |
| | | | ||||||
* | | | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 4 | -3/+46 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Handle edge cases in the previous patch. | José Valim | 2010-08-02 | 1 | -1/+2 | |
| | | | ||||||
* | | | Improved how AppGenerator generates the application name. It now detects the ↵ | Fred Wu | 2010-08-02 | 2 | -1/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. [#5225 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 ↵ | Alex Le | 2010-08-02 | 3 | -6/+22 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 ↵ | Chris Hoffman | 2010-08-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-08-02 | 2 | -1/+16 | |
|\ \ \ | ||||||
| * | | | Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when ↵ | Santiago Pastorino | 2010-08-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | using the deprecated syntax [#5263 state:committed] | |||||
| * | | | Failing test to check for route file corruption if legacy map parameter is ↵ | rohit | 2010-08-02 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | used. [#5263 state:open] | |||||
* | | | | Add an internal (private API) after_touch callback. [#5271 state:resolved] | José Valim | 2010-08-02 | 5 | -19/+24 | |
| | | | | ||||||
* | | | | added failing touch propagation test | Jakub Kuźma | 2010-08-02 | 2 | -0/+19 | |
|/ / / | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | Corrected the rake test:units and test:functionals description [#5251 ↵ | Prashant P. Shah | 2010-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | | Use AS::OrderedHash when trusting in the order of the hash | Santiago Pastorino | 2010-08-01 | 1 | -2/+3 | |
| | | | ||||||
* | | | Fix label form helper to use I18n and html options, without the need of ↵ | Carlos Antonio da Silva | 2010-08-01 | 2 | -5/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'nil' text param: Before: f.label :title, nil, :class => 'title' After : f.label :title, :class => 'title' [#5267 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | typo | Brian Lopez | 2010-08-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | update tests for mysql2 support | Brian Lopez | 2010-08-02 | 17 | -26/+467 | |
| |/ |/| | ||||||
* | | Makes form_helper use overriden model accessors | Santiago Pastorino | 2010-08-01 | 2 | -3/+20 | |
| | | | | | | | | [#3374 state:committed] | |||||
* | | explains Array.wrap directly, rather by comparison with Kernel#Array which ↵ | Xavier Noria | 2010-08-01 | 2 | -4/+48 | |
| | | | | | | | | is too obscure, leaves the comparison to document the differences, and adds a comparison with the related idiom that uses the splat operator | |||||
* | | DHH forgot to remove JS, CSS in generated index.html [#5261 state:resolved] | Johan Lundström | 2010-07-31 | 1 | -23/+0 | |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | fixes typo | Xavier Noria | 2010-07-31 | 1 | -1/+1 | |
| | | ||||||
* | | use the same amount of left indent in all code blocks of README.rdoc | Xavier Noria | 2010-07-31 | 1 | -2/+2 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-31 | 19 | -56/+99 | |
|\ | ||||||
| * | README.rdoc is your first impression, make sure it is clean | Xavier Noria | 2010-07-31 | 1 | -10/+19 | |
| | | | | | | | | | | | | | | * Removes spurious markup from code blocks * Integrates code blocks into ordinary paragraph flow * Change link to the Rails Tutorial so that it points directly to the book * Use proper RDoc markup for links | |||||
| * | reverting where() functionality, adding a test | Aaron Patterson | 2010-07-30 | 2 | -4/+9 | |
| | | ||||||
| * | fewer method calls, using faster methods when possible | Aaron Patterson | 2010-07-30 | 1 | -5/+5 | |
| | | ||||||
| * | reducing function calls and using faster methods for testing | Aaron Patterson | 2010-07-30 | 2 | -16/+10 | |
| | | ||||||
| * | if there's a Gemfile and doc:guides can't load RedCloth, print instructions ↵ | Xavier Noria | 2010-07-30 | 1 | -1/+20 | |
| | | | | | | | | for bundler | |||||
| * | the main page of the API generated by the doc:rails task is README | Xavier Noria | 2010-07-30 | 1 | -1/+1 | |
| | | ||||||
| * | AS gem doesn't depend on nokogiri so shows a nicer error if users haven't ↵ | Santiago Pastorino | 2010-07-30 | 2 | -3/+13 | |
| | | | | | | | | installed | |||||
| * | Make options an attr_reader | Santiago Pastorino | 2010-07-30 | 1 | -6/+1 | |
| | | ||||||
| * | fix for rails app generator when using --pretend option | Steve Agalloco | 2010-07-30 | 2 | -1/+7 | |
| | | | | | | | | | | | | [#5245 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Add another missing require in 'active_support/inflector/inflections' | Carl Lerche | 2010-07-29 | 1 | -0/+1 | |
| | | ||||||
| * | Bump up bundler version to rc.2 | Santiago Pastorino | 2010-07-29 | 3 | -3/+3 | |
| | | ||||||
| * | This version is going to be outdated when new nokogiri versions are released | Santiago Pastorino | 2010-07-29 | 2 | -2/+2 | |
| | | ||||||
| * | Bump up nokogiri to 1.4.3.1 | Santiago Pastorino | 2010-07-29 | 2 | -3/+3 | |
| | | ||||||
| * | Don't increment and then decrement the same counter when re-assigning a ↵ | Tarmo Tänav | 2010-07-29 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | returns not returned . fixing documentation for reflection | Neeraj Singh | 2010-07-30 | 1 | -28/+30 | |
| | | ||||||
* | | Command Line Guide: changes all 'rails app' commands to 'rails new app' | Arkadiusz Holko | 2010-07-30 | 1 | -6/+6 | |
| | | ||||||
* | | API Docs: Use 'HTTP_AUTHORIZATION' and not :authorize as key in integration ↵ | Rohit Arondekar | 2010-07-30 | 1 | -1/+1 | |
|/ | | | | tests. |