Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 5 | -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-1 | José Valim | 2011-05-17 | 1 | -1/+1 |
|\ | | | | | Using the correct CSS compressor for the yui-compressor gem. | ||||
| * | Using the correct CSS compressor for the yui-compressor gem. | Lucas Mazza | 2011-05-16 | 1 | -1/+1 |
| | | |||||
* | | Use anonymous? that works on both Ruby 1.8 and 1.9. | José Valim | 2011-05-17 | 2 | -5/+7 |
| | | |||||
* | | Merge pull request #1104 from colinyoung/master | José Valim | 2011-05-17 | 1 | -1/+1 |
|\ \ | | | | | | | Update Chicago mayor | ||||
| * | | Updated seeds.rb file. | Colin Young | 2011-05-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1106 from vatrai/user_instruct | José Valim | 2011-05-17 | 6 | -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 #1103 | Vishnu Atrai | 2011-05-17 | 6 | -2/+22 |
| | | | | |||||
* | | | | Merge pull request #1090 from dchelimsky/issue-1089 | José Valim | 2011-05-17 | 3 | -21/+54 |
|\ \ \ \ | |/ / / |/| | | | 3.1: params_wrapper raises error on anynomous controllers | ||||
| * | | | add more robust test for wrapping params with anonymous class | David Chelimsky | 2011-05-17 | 3 | -28/+51 |
| | | | | |||||
| * | | | Add fix for error when an anonymous controller subclasses ApplicationController | Andy Lindeman | 2011-05-17 | 1 | -1/+4 |
| | | | | |||||
| * | | | better test name | David Chelimsky | 2011-05-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | add failing test for https://github.com/rails/rails/issues/1089 | David Chelimsky | 2011-05-17 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #1105 from kevmoo/b1103 | José Valim | 2011-05-17 | 2 | -3/+4 |
|\ \ \ \ | |_|/ / |/| | | | For Issue #1103 - Fix for sqlite3.yml, mysql.yml | ||||
| * | | | Fix for sqlite3.yml, mysql.yml | Kevin Moore | 2011-05-17 | 2 | -3/+4 |
|/ / / | |||||
* | | | Merge pull request #1100 from arunagw/innerjoin_test | Jon Leighton | 2011-05-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture. | ||||
| * | | | Fixed InnerJoinAssociationTest. Need to load essays fixture. | Arun Agrawal | 2011-05-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Don't print deprecation warnings every time the user reads or writes an ↵ | Michael Koziarski | 2011-05-17 | 1 | -2/+0 |
|/ / / | | | | | | | | | | inheritable attribute. The warnings on declaration is enough. | ||||
* | | | Merge pull request #1099 from dlee/optimize_indifferent_access | José Valim | 2011-05-17 | 2 | -2/+15 |
|\ \ \ | | | | | | | | | Optimize parts of HashWithIndifferentAccess | ||||
| * | | | Optimize parts of HashWithIndifferentAccess | David Lee | 2011-05-17 | 2 | -2/+15 |
| |/ / | |||||
* / / | Fixes failing test, closes #1098. | José Valim | 2011-05-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1095 from guilleiguaran/fix_join_model_test | Jon Leighton | 2011-05-17 | 1 | -0/+1 |
|\ \ | | | | | | | Adding missing require to join_model_test | ||||
| * | | Adding missing require | Guillermo Iguaran | 2011-05-16 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 4 | -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 Iguaran | 2011-05-15 | 4 | -1/+19 |
| | | | | | | | | false. fixes #557 | ||||
* | | configuratin guide: finished a pass to the "Rails General Configuration" section | Xavier Noria | 2011-05-16 | 1 | -26/+20 |
| | | |||||
* | | Deprecate attr_accessor_with_default. | José Valim | 2011-05-16 | 2 | -4/+13 |
| | | |||||
* | | Merge pull request #1087 from amatsuda/generate_number_field_tag | José Valim | 2011-05-16 | 2 | -7/+12 |
|\ \ | | | | | | | generate HTML5 number_field tag for integer fields | ||||
| * | | generate HTML5 number_field tag for integer fields | Akira Matsuda | 2011-05-16 | 2 | -7/+12 |
|/ / | |||||
* | | Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanup | José Valim | 2011-05-16 | 2 | -6/+2 |
|\ \ | | | | | | | cleanups on AMo validator initializers | ||||
| * | | Remove unneeded merge with default false options | Akira Matsuda | 2011-05-16 | 1 | -4/+0 |
| | | | |||||
| * | | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵ | Akira Matsuda | 2011-05-16 | 1 | -2/+2 |
|/ / | | | | | | | it only when needed. | ||||
* | | Merge pull request #573 from smartinez87/attr | José Valim | 2011-05-15 | 1 | -0/+3 |
|\ \ | | | | | | | Add doc to #attribute_names | ||||
| * | | Add doc to #attribute_names | Sebastian Martinez | 2011-05-15 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #570 from sikachu/decouple_actionpack | José Valim | 2011-05-15 | 6 | -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 Sichanugrist | 2011-05-15 | 3 | -14/+12 |
| | | | | | | | | | | | | of `.column_names` | ||||
| * | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵ | Prem Sichanugrist | 2011-05-15 | 3 | -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_fixes | José Valim | 2011-05-15 | 2 | -36/+40 |
|\ \ \ | |/ / |/| | | Fields for fixes for non nested attributes and without object | ||||
| * | | Use record_name to make fields for methods more consistent | Carlos Antonio da Silva | 2011-05-14 | 1 | -6/+6 |
| | | | |||||
| * | | Refactor fields_for to make the api more clear, and fix usage with non ↵ | Carlos Antonio da Silva | 2011-05-14 | 2 | -26/+33 |
| | | | | | | | | | | | | nested attributes and without object | ||||
| * | | Cleanup instantiate builder method definition | Carlos Antonio da Silva | 2011-05-14 | 1 | -5/+2 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-15 | 2 | -8/+8 |
|\ \ \ | |||||
| * | | | Use more English language | Pirogov Evgenij | 2011-05-15 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fixing Changelog link | Guillermo Iguaran | 2011-05-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Clean up redundant backslashes | Pirogov Evgenij | 2011-05-14 | 1 | -4/+4 |
| | | | | |||||
* | | | | reviewed the first ~70 lines of the configuration guide | Xavier Noria | 2011-05-15 | 1 | -20/+21 |
| | | | | |||||
* | | | | Merge pull request #564 from sikachu/fix_wrapper | Aaron Patterson | 2011-05-14 | 2 | -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 Sichanugrist | 2011-05-15 | 2 | -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 Leighton | 2011-05-14 | 1 | -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 Leighton | 2011-05-14 | 4 | -5/+17 |
| | | | | | | | | | | | | attributes when copying, rather than using the assignment method |