aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #1468 from castlerock/fix_issue_1467José Valim2011-06-030-0/+0
|\ \ \ \ | | | | | | | | | | Double assignment of attributes on a collection association occurs fixed #1467
| * | | | Double assignment of attributes on a collection association occurs fixed for ↵Raghunadh2011-06-031-1/+0
| |/ / / | | | | | | | | | | | | the issue issue #1467
* / / / Don't double assign attributes - closes #1467.Andrew White2011-06-031-1/+0
|/ / /
* | | Fix broken test. You know, the merge button will be the end of us...Jon Leighton2011-06-011-3/+3
| | |
* | | Merge pull request #1447 from dmathieu/empty_routePiotr Sarnacki2011-06-012-1/+9
|\ \ \ | | | | | | | | Fix creating an empty route on 1.8. Closes #1210
| * | | fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-012-1/+9
| | | |
* | | | Merge pull request #1385 from smartinez87/dropAaron Patterson2011-06-011-1/+1
|\ \ \ \ | | | | | | | | | | #drop_table accepts no options now.
| * | | | #drop_table accepts no options now.Sebastian Martinez2011-05-281-1/+1
| | | | |
* | | | | Adding commentArun Agrawal2011-06-011-0/+1
| | | | |
* | | | | AttributeMethodTest test fix #jrubyVishnu Atrai2011-06-011-1/+5
| | | | |
* | | | | Fix issue #1272Brian Mathiyakom2011-06-014-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Set reverse_order_value when asked to reverse_order(). Do the actual reversal in build_arel.
* | | | | Merge pull request #1448 from ernie/attr_internal_requireJosé Valim2011-06-011-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Require attr_internal before using in ActionView::Helpers
| * | | | Require attr_internal before using in ActionView::HelpersErnie Miller2011-06-011-0/+2
| | | | |
* | | | | Merge pull request #1441 from guilleiguaran/no_rb_requireJosé Valim2011-06-012-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Don't add .rb in requires
| * | | | | Don't add .rb in requiresGuillermo Iguaran2011-05-312-2/+2
| | | | | |
* | | | | | Add missing require to fix the CIJon Leighton2011-06-011-0/+1
| | | | | |
* | | | | | Merge pull request #1439 from sikachu/isolated_pg_testAaron Patterson2011-05-312-20/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Isolated PostgreSQL test into PostgreSQL folder
| * | | | | Isolated PostgreSQL test into PostgreSQL folderPrem Sichanugrist2011-05-312-20/+29
|/ / / / /
* | | | | Raise NameError instead of ArgumentError in ActiveSupport::DependenciesAndrew White2011-06-015-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. Closes #1423
* | | | | added an alias for new to build to the AR collection proxy, this corrects an ↵Josh Kalderimis2011-06-014-10/+27
| | | | | | | | | | | | | | | | | | | | issue where the collection proxies were not consistent
* | | | | Make MemCacheStore work with Ruby 1.9 and -KuAndrew White2011-05-311-1/+1
| | | | |
* | | | | Merge pull request #1434 from dmathieu/mass_assignmentJosé Valim2011-05-311-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Mass assignment
| * | | | | no need for .rbDamien Mathieu2011-05-311-1/+1
| | | | | |
| * | | | | string inflections are needed for running tests in isolationDamien Mathieu2011-05-311-0/+1
| | | | | |
* | | | | | Revert "[activerecord][postgresql] verify if table has a schema(not ↵Jon Leighton2011-05-311-5/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | public)". This caused a test breakage. See #1410 for details. This reverts commit c44418ea4e09cc81da47edbc9ac5f31c7e32c1b4.
* | | | | standarize documentation (and indirectly code) to use American English as ↵Xavier Noria2011-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discussed in 4f234bf Please do not perform monster patches for this until 3.1 is out. Also, no existing API should be affected by this. New code, local variables, etc. would follow this guideline to have a consistent project tree in this regard.
* | | | | revises commit from pull request 1408Xavier Noria2011-05-311-4/+7
| | | | |
* | | | | revises commit from pull request 1409Xavier Noria2011-05-311-4/+8
| | | | |
* | | | | Modified generated text to explain where .js and .coffee files can be ↵Noel Gomez2011-05-311-3/+5
| | | | | | | | | | | | | | | | | | | | located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8
* | | | | changed text to be more explicit about where stylesheets can be locatedNoel Gomez2011-05-311-2/+5
| | | | |
* | | | | Ensure that calculations properly override the select value even if it's set ↵Jon Leighton2011-05-312-2/+7
| | | | | | | | | | | | | | | | | | | | in the default scope. Fixes #1395.
* | | | | Failing test for aggregating on default_scope with selectErik Fonselius2011-05-312-0/+9
| | | | |
* | | | | Only save the record once when calling create! on a collection association. ↵Jon Leighton2011-05-314-25/+45
| | | | | | | | | | | | | | | | | | | | Fixes #1360.
* | | | | Tests for issue #1360Farley Knight2011-05-312-0/+24
| | | | |
* | | | | Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted ↵Jon Leighton2011-05-311-8/+5
| | | | | | | | | | | | | | | | | | | | the branch so I cannot just merge it.
* | | | | Reduce test noiseJon Leighton2011-05-311-20/+14
| |_|/ / |/| | |
* | | | Merge pull request #1417 from arunagw/nested_attributes_fixAaron Patterson2011-05-312-8/+11
|\ \ \ \ | | | | | | | | | | Fix nested attribute for memory record.
| * | | | Opening class CascadedEagerLoadingTest at once.Arun Agrawal2011-05-311-7/+3
| | | | |
| * | | | Adding comment to work with 1.8.7. Nested Attribute fix.Arun Agrawal2011-05-311-0/+3
| | | | |
| * | | | Fix nested attribute for memory record.Arun Agrawal2011-05-311-1/+5
| | | | |
* | | | | Update CHANGELOG.José Valim2011-05-311-0/+2
| | | | |
* | | | | Transform the symbol into a constant lookup.José Valim2011-05-313-29/+32
| | | | |
* | | | | Merge pull request #1403 from bogdan/configJosé Valim2011-05-313-12/+48
|\ \ \ \ \ | | | | | | | | | | | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method
| * | | | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-303-12/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option
* | | | | | Merge pull request #1415 from brainopia/masterJosé Valim2011-05-301-5/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove autoload for non-existing constants
| * | | | | Remove autoload for a couple of constants which don't exist anymorebrainopia2011-05-311-5/+0
|/ / / / /
* | | | | Merge pull request #1410 from lucasts/pg_schemaAaron Patterson2011-05-301-5/+11
|\ \ \ \ \ | | | | | | | | | | | | a little step to better postgresql schema support in rails
| * | | | | [activerecord][postgresql] verify if table has a schema(not public)Lucas Stephanou2011-05-271-6/+5
| | | | | |
| * | | | | find sequences with pg schemas properlyLucas Stephanou2011-05-271-4/+11
| | | | | |
* | | | | | Merge pull request #1404 from ↵José Valim2011-05-303-1/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | commuter/plugin_new_generator_should_properly_require_js properly require javascript libraries when generating mountable engine