aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* better test nameDavid Chelimsky2011-05-171-1/+1
|
* add failing test for https://github.com/rails/rails/issues/1089David Chelimsky2011-05-171-0/+7
|
* Merge pull request #1095 from guilleiguaran/fix_join_model_testJon Leighton2011-05-171-0/+1
|\ | | | | Adding missing require to join_model_test
| * Adding missing requireGuillermo Iguaran2011-05-161-0/+1
|/
* Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-164-1/+19
|\ | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false
| * Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵Guillermo Iguaran2011-05-154-1/+19
| | | | | | | | false. fixes #557
* | configuratin guide: finished a pass to the "Rails General Configuration" sectionXavier Noria2011-05-161-26/+20
| |
* | Deprecate attr_accessor_with_default.José Valim2011-05-162-4/+13
| |
* | Merge pull request #1087 from amatsuda/generate_number_field_tagJosé Valim2011-05-162-7/+12
|\ \ | | | | | | generate HTML5 number_field tag for integer fields
| * | generate HTML5 number_field tag for integer fieldsAkira Matsuda2011-05-162-7/+12
|/ /
* | Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanupJosé Valim2011-05-162-6/+2
|\ \ | | | | | | cleanups on AMo validator initializers
| * | Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
| | |
| * | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵Akira Matsuda2011-05-161-2/+2
|/ / | | | | | | it only when needed.
* | Merge pull request #573 from smartinez87/attrJosé Valim2011-05-151-0/+3
|\ \ | | | | | | Add doc to #attribute_names
| * | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
|/ /
* | Merge pull request #570 from sikachu/decouple_actionpackJosé Valim2011-05-156-14/+35
|\ \ | | | | | | Make ParamsWrapper use a well-defined API and not rely on AR methods
| * | Make ParamsWrapper calling newly introduced `Model.attribute_names` instead ↵Prem Sichanugrist2011-05-153-14/+12
| | | | | | | | | | | | of `.column_names`
| * | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵Prem Sichanugrist2011-05-153-0/+23
| | | | | | | | | | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists.
* | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixesJosé Valim2011-05-152-36/+40
|\ \ \ | |/ / |/| | Fields for fixes for non nested attributes and without object
| * | Use record_name to make fields for methods more consistentCarlos Antonio da Silva2011-05-141-6/+6
| | |
| * | Refactor fields_for to make the api more clear, and fix usage with non ↵Carlos Antonio da Silva2011-05-142-26/+33
| | | | | | | | | | | | nested attributes and without object
| * | Cleanup instantiate builder method definitionCarlos Antonio da Silva2011-05-141-5/+2
| | |
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-152-8/+8
|\ \ \
| * | | Use more English languagePirogov Evgenij2011-05-151-4/+4
| | | |
| * | | Fixing Changelog linkGuillermo Iguaran2011-05-151-1/+1
| | | |
| * | | Clean up redundant backslashesPirogov Evgenij2011-05-141-4/+4
| | | |
* | | | reviewed the first ~70 lines of the configuration guideXavier Noria2011-05-151-20/+21
| | | |
* | | | Merge pull request #564 from sikachu/fix_wrapperAaron Patterson2011-05-142-2/+15
|\ \ \ \ | |_|/ / |/| | | Do not try to call `column_names` on the abstract class.
| * | | Do not try to call `column_names` on the abstract class.Prem Sichanugrist2011-05-152-2/+15
|/ / / | | | | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it.
* | | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
| | | | | | | | | | | | | | | * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code) * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in)
* | | CollectionAssociation#merge_target_lists should write to the underlying ↵Jon Leighton2011-05-144-5/+17
| | | | | | | | | | | | attributes when copying, rather than using the assignment method
* | | An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
| |/ |/|
* | Added some docs to controller runtime.José Valim2011-05-141-1/+4
| |
* | Merge pull request #554 from ↵José Valim2011-05-142-1/+19
|\ \ | |/ |/| | | | | tomafro/reset-activerecord-runtime-before-each-request ActiveRecord::LogSubscriber.runtime should be reset at the start of each request
| * Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-142-0/+18
| | | | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.
| * Escape regex in controller_runtime_test to actually check that the ↵Tom Ward2011-05-141-1/+1
|/ | | | ActiveRecord message appears
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1442-220/+319
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * minor edits after going through what's new in docrailsXavier Noria2011-05-143-10/+13
| |
| * [GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize ↵Karel Minarik2011-05-141-4/+5
| | | | | | | | conflicts with regular environment variables (eg. in Ubuntu)
| * minor correctionsVijay Dev2011-05-141-5/+5
| |
| * Link the API documentation to non-edge insteadPrem Sichanugrist2011-05-131-1/+1
| |
| * Adding guide for wrapping JSON/XML parameters, which also links to the API ↵Prem Sichanugrist2011-05-131-0/+26
| | | | | | | | | | documentation. Note that it currently links to http://edgeapi.rubyonrails.org because it's Rails 3.1 feature.
| * Prefer topic branches instead of master branch for users contributionsGuillermo Iguaran2011-05-121-5/+8
| |
| * added an example for AC::UrlFor usage to make usage simpler.Nick Sutterer2011-05-121-1/+13
| |
| * added docs for AbC::UrlFor and AC::UrlFor.Nick Sutterer2011-05-122-0/+12
| |
| * fix spellingsVijay Dev2011-05-112-2/+2
| |
| * indentation fixesVijay Dev2011-05-111-24/+23
| |
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-05-1111-92/+98
| |\
| | * fix bad encoding on contributing to RoR pageDan Pickett2011-05-101-1/+1
| | |
| | * Follow code conventions on docsSebastian Martinez2011-05-105-13/+13
| | |