aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #1104 from colinyoung/masterJosé Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated seeds.rb file.Colin Young2011-05-171-1/+1
* | | | | | | | | | | | | | | Merge pull request #1106 from vatrai/user_instructJosé Valim2011-05-176-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | instruct user to install using Gem file in database.yml templete issue #1103Vishnu Atrai2011-05-176-2/+22
* | | | | | | | | | | | | | | | Merge pull request #1090 from dchelimsky/issue-1089José Valim2011-05-173-21/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | add more robust test for wrapping params with anonymous classDavid Chelimsky2011-05-173-28/+51
| * | | | | | | | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationControllerAndy Lindeman2011-05-171-1/+4
| * | | | | | | | | | | | | | | 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 #1105 from kevmoo/b1103José Valim2011-05-172-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for sqlite3.yml, mysql.ymlKevin Moore2011-05-172-3/+4
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #1100 from arunagw/innerjoin_testJon Leighton2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture.Arun Agrawal2011-05-171-1/+1
* | | | | | | | | | | | | | | | 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