aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5336 from kennyj/fix_wrong_extensionXavier Noria2012-03-081-1/+1
|\ | | | | Update CHANGELOG to fix wrong extension.
| * Update CHANGELOG to fix wrong extension.kennyj2012-03-081-1/+1
|/
* Merge pull request #5289 from rafaelfranca/fix-through-associationsJon Leighton2012-03-086-8/+43
|\ | | | | Fix has_many through associations when mass_assignment_sanitizer is strict
| * Not need to pass join attributes to association buildRafael Mendonça França2012-03-075-16/+21
| |
| * Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-054-4/+34
| | | | | | | | :strict
* | Merge pull request #5162 from kennyj/schema_cache_dumpAaron Patterson2012-03-079-18/+173
|\ \ | | | | | | [Proposal] Schema cache dump
| * | Add entry for schema cache dump to CHANGELOG.md.kennyj2012-03-011-0/+23
| | |
| * | Support judgement expired schema cache dump.kennyj2012-03-013-4/+25
| | |
| * | Load db/schema_cache.dump duaring boot time.kennyj2012-03-015-3/+32
| | |
| * | Add db:schema:cache:dump and db:schema:cache:clear tasks.kennyj2012-03-013-0/+47
| | |
| * | Add support schema cache dump and load.kennyj2012-03-012-14/+49
| | |
* | | Revert "let the connection pool of new applications have size 1 rather than 5"Xavier Noria2012-03-074-36/+12
| | | | | | | | | | | | | | | | | | | | | Reason: Temporarily reverting this because it has uncovered an issue that prevents Sam's test suite from passing. This reverts commit 9b2c38b7bd582d9712c3779294a9bccde7bbd548.
* | | Revert "updates the new default pool size in some additional places"Xavier Noria2012-03-073-17/+7
| | | | | | | | | | | | | | | | | | Reason: We are about to temporarily revert the change to the default. This reverts commit 5c0aba238c37a71fce08f949bc2c6bdd9aab4f7b.
* | | Add tests to test that through associations are not readonly, and we can ↵kuahyeow2012-03-081-0/+11
| | | | | | | | | | | | update the records we retrive from the association
* | | Merge pull request #5315 from ↵Aaron Patterson2012-03-072-2/+62
|\ \ \ | | | | | | | | | | | | | | | | travisjeffery/enhance_postgresql_adapter_schema_support Enhance PostgreSQL Adapter schema support
| * | | Adds #create/drop_schema on the PostgreSQL Adapter.Travis Jeffery2012-03-072-2/+47
| | | |
| * | | Add #schema_names to PostgreSQL Adapter.Travis Jeffery2012-03-072-0/+15
| | | |
* | | | Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
|\ \ \ \ | | | | | | | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
| * | | | attribute_present? should return false for empty stringsJacob Green2012-03-062-1/+4
| | | | |
* | | | | Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
| | | | |
* | | | | Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7
| | | | |
* | | | | Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-layoutSantiago Pastorino2012-03-071-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Add test case for #5307
| * | | | | Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
| |/ / / /
* | | | | fixes #4506 [ci skip]Vijay Dev2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | odd and even keys are not scoped by activerecord.
* | | | | Merge pull request #5305 from arunagw/warning_fixVijay Dev2012-03-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | warning fix : mismatched indentations at 'end' with 'case'
| * | | | warning fix : mismatched indentations at 'end' with 'case'Arun Agrawal2012-03-061-1/+1
| | | | |
* | | | | Merge pull request #5310 from Serabe/layout_for_partials_with_collectionsJosé Valim2012-03-064-1/+53
|\ \ \ \ \ | | | | | | | | | | | | Adds :layout option to render :partial when a collection is given.
| * | | | | Adds line to change log and update documentation.Sergio Arbeo2012-03-072-0/+39
| | | | | |
| * | | | | Adds :layout option to render :partial when a collection is given.Sergio Arbeo2012-03-063-1/+14
| | | | | |
* | | | | | Merge pull request #5309 from carlosantoniodasilva/ad-uploaded-fileAaron Patterson2012-03-062-9/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor ActionDispatch::UploadedFile
| * | | | | | Refactor AD::UploadedFile, and raise sooner if tempfile is not presentCarlos Antonio da Silva2012-03-062-9/+7
|/ / / / / /
* | | | | | Ensure load hooks can be called more than once with different contexts.José Valim2012-03-062-6/+35
| | | | | |
* | | | | | Remove unused ActionController::SessionManagementSantiago Pastorino2012-03-064-12/+0
| | | | | |
* | | | | | Avoid ImplicitRender just call render directlySantiago Pastorino2012-03-061-3/+1
| | | | | |
* | | | | | Clean up module docs [ci skip]Vijay Dev2012-03-0712-80/+73
| | | | | | | | | | | | | | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some.
* | | | | | Merge pull request #5304 from kennyj/fix_connection_dependencyAaron Patterson2012-03-062-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Revert table_name= needs connection now, so just stub table_name
| * | | | | Revert table_name= needs connection now, so just stub table_namekennyj2012-03-072-2/+2
|/ / / / /
* | | | | Use latest rack-cache.José Valim2012-03-061-1/+1
| | | | |
* | | | | Increasing minimum version of mail due to security vulnerability found in ↵Mikel Lindsaar2012-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | Mail 2.4.1 for sendmail or exim
* | | | | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\ \ \ \ \ | | | | | | | | | | | | Always passing a respond block from to responder
| * | | | | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280
| * | | | | Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
| |/ / / /
* | | | | Merge pull request #5296 from dlitz/relative_url_root_from_script_nameJosé Valim2012-03-063-1/+104
|\ \ \ \ \ | |/ / / / |/| | | | Compute asset paths from the request if RAILS_RELATIVE_URL_ROOT not set
| * | | | Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵Dwayne Litzenberger2012-03-053-1/+104
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910
* | | | Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\ \ \ \ | | | | | | | | | | Added parsing of arbitrary media type parameters.
| * | | | Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127.
* | | | | Add config.middleware.api_only!Carlos Antonio da Silva and Santiago Pastorino2012-03-053-4/+42
| | | | |
* | | | | Merge pull request #5288 from lest/patch-2José Valim2012-03-052-0/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | force response body to be read in assert_template
| * | | | force response body to be read in assert_templateSergey Nartimov2012-03-052-0/+17
|/ / / /
* | | | Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-053-1/+40
| | | | | | | | | | | | | | | | builder