aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a test case for issue #476.José Valim2011-05-171-0/+31
|
* Pass the attribute and option hashes to build_associationAndrew White2011-05-175-8/+54
| | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash.
* Merge pull request #1093 from lucasmazza/patch-1José Valim2011-05-171-1/+1
|\ | | | | Using the correct CSS compressor for the yui-compressor gem.
| * Using the correct CSS compressor for the yui-compressor gem.Lucas Mazza2011-05-161-1/+1
| |
* | Use anonymous? that works on both Ruby 1.8 and 1.9.José Valim2011-05-172-5/+7
| |
* | Merge pull request #1104 from colinyoung/masterJosé Valim2011-05-171-1/+1
|\ \ | | | | | | Update Chicago mayor
| * | 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 template
| * | | 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
|\ \ \ \ | |/ / / |/| | | 3.1: params_wrapper raises error on anynomous controllers
| * | | 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
|\ \ \ \ | |_|/ / |/| | | For Issue #1103 - Fix for sqlite3.yml, mysql.yml
| * | | 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.
| * | | 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 ↵Michael Koziarski2011-05-171-2/+0
|/ / / | | | | | | | | | inheritable attribute. The warnings on declaration is enough.
* | | Merge pull request #1099 from dlee/optimize_indifferent_accessJosé Valim2011-05-172-2/+15
|\ \ \ | | | | | | | | Optimize parts of HashWithIndifferentAccess
| * | | 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 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)