aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't print deprecation warnings every time the user reads or writes an inher...Michael Koziarski2011-05-171-2/+0
* Merge pull request #1099 from dlee/optimize_indifferent_accessJosé Valim2011-05-172-2/+15
|\
| * Optimize parts of HashWithIndifferentAccessDavid Lee2011-05-172-2/+15
* | Fixes failing test, closes #1098.José Valim2011-05-171-1/+1
|/
* Merge pull request #1095 from guilleiguaran/fix_join_model_testJon Leighton2011-05-171-0/+1
|\
| * 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 association when ActiveRecord::Base.pluralize_table_names is ...Guillermo Iguaran2011-05-154-1/+19
* | 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 fieldsAkira Matsuda2011-05-162-7/+12
|/ /
* | Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanupJosé Valim2011-05-162-6/+2
|\ \
| * | Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
| * | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it...Akira Matsuda2011-05-161-2/+2
|/ /
* | Merge pull request #573 from smartinez87/attrJosé Valim2011-05-151-0/+3
|\ \
| * | 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 calling newly introduced `Model.attribute_names` instead o...Prem Sichanugrist2011-05-153-14/+12
| * | Add ActiveRecord::attribute_names to retrieve a list of attribute names. This...Prem Sichanugrist2011-05-153-0/+23
* | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixesJosé Valim2011-05-152-36/+40
|\ \ \ | |/ / |/| |
| * | 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 nested...Carlos Antonio da Silva2011-05-142-26/+33
| * | 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.Prem Sichanugrist2011-05-152-2/+15
|/ / /
* | | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
* | | CollectionAssociation#merge_target_lists should write to the underlying attri...Jon Leighton2011-05-144-5/+17
* | | 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 tomafro/reset-activerecord-runtime-before-each-r...José Valim2011-05-142-1/+19
|\ \ | |/ |/|
| * Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-142-0/+18
| * Escape regex in controller_runtime_test to actually check that the ActiveReco...Tom Ward2011-05-141-1/+1
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1442-220/+319
|\
| * 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 con...Karel Minarik2011-05-141-4/+5
| * 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 do...Prem Sichanugrist2011-05-131-0/+26
| * 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
| |\