Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5336 from kennyj/fix_wrong_extension | Xavier Noria | 2012-03-08 | 1 | -1/+1 |
|\ | | | | | Update CHANGELOG to fix wrong extension. | ||||
| * | Update CHANGELOG to fix wrong extension. | kennyj | 2012-03-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5289 from rafaelfranca/fix-through-associations | Jon Leighton | 2012-03-08 | 6 | -8/+43 |
|\ | | | | | Fix has_many through associations when mass_assignment_sanitizer is strict | ||||
| * | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-07 | 5 | -16/+21 |
| | | |||||
| * | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-05 | 4 | -4/+34 |
| | | | | | | | | :strict | ||||
* | | Merge pull request #5162 from kennyj/schema_cache_dump | Aaron Patterson | 2012-03-07 | 9 | -18/+173 |
|\ \ | | | | | | | [Proposal] Schema cache dump | ||||
| * | | Add entry for schema cache dump to CHANGELOG.md. | kennyj | 2012-03-01 | 1 | -0/+23 |
| | | | |||||
| * | | Support judgement expired schema cache dump. | kennyj | 2012-03-01 | 3 | -4/+25 |
| | | | |||||
| * | | Load db/schema_cache.dump duaring boot time. | kennyj | 2012-03-01 | 5 | -3/+32 |
| | | | |||||
| * | | Add db:schema:cache:dump and db:schema:cache:clear tasks. | kennyj | 2012-03-01 | 3 | -0/+47 |
| | | | |||||
| * | | Add support schema cache dump and load. | kennyj | 2012-03-01 | 2 | -14/+49 |
| | | | |||||
* | | | Revert "let the connection pool of new applications have size 1 rather than 5" | Xavier Noria | 2012-03-07 | 4 | -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 Noria | 2012-03-07 | 3 | -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 ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 |
| | | | | | | | | | | | | update the records we retrive from the association | ||||
* | | | Merge pull request #5315 from ↵ | Aaron Patterson | 2012-03-07 | 2 | -2/+62 |
|\ \ \ | | | | | | | | | | | | | | | | | travisjeffery/enhance_postgresql_adapter_schema_support Enhance PostgreSQL Adapter schema support | ||||
| * | | | Adds #create/drop_schema on the PostgreSQL Adapter. | Travis Jeffery | 2012-03-07 | 2 | -2/+47 |
| | | | | |||||
| * | | | Add #schema_names to PostgreSQL Adapter. | Travis Jeffery | 2012-03-07 | 2 | -0/+15 |
| | | | | |||||
* | | | | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 2 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | ||||
| * | | | | attribute_present? should return false for empty strings | Jacob Green | 2012-03-06 | 2 | -1/+4 |
| | | | | | |||||
* | | | | | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-layout | Santiago Pastorino | 2012-03-07 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Add test case for #5307 | ||||
| * | | | | | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| |/ / / / | |||||
* | | | | | fixes #4506 [ci skip] | Vijay Dev | 2012-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | odd and even keys are not scoped by activerecord. | ||||
* | | | | | Merge pull request #5305 from arunagw/warning_fix | Vijay Dev | 2012-03-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | warning fix : mismatched indentations at 'end' with 'case' | ||||
| * | | | | warning fix : mismatched indentations at 'end' with 'case' | Arun Agrawal | 2012-03-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 4 | -1/+53 |
|\ \ \ \ \ | | | | | | | | | | | | | Adds :layout option to render :partial when a collection is given. | ||||
| * | | | | | Adds line to change log and update documentation. | Sergio Arbeo | 2012-03-07 | 2 | -0/+39 |
| | | | | | | |||||
| * | | | | | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 3 | -1/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #5309 from carlosantoniodasilva/ad-uploaded-file | Aaron Patterson | 2012-03-06 | 2 | -9/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor ActionDispatch::UploadedFile | ||||
| * | | | | | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 2 | -9/+7 |
|/ / / / / / | |||||
* | | | | | | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-06 | 2 | -6/+35 |
| | | | | | | |||||
* | | | | | | Remove unused ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 4 | -12/+0 |
| | | | | | | |||||
* | | | | | | Avoid ImplicitRender just call render directly | Santiago Pastorino | 2012-03-06 | 1 | -3/+1 |
| | | | | | | |||||
* | | | | | | Clean up module docs [ci skip] | Vijay Dev | 2012-03-07 | 12 | -80/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some. | ||||
* | | | | | | Merge pull request #5304 from kennyj/fix_connection_dependency | Aaron Patterson | 2012-03-06 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Revert table_name= needs connection now, so just stub table_name | ||||
| * | | | | | Revert table_name= needs connection now, so just stub table_name | kennyj | 2012-03-07 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Use latest rack-cache. | José Valim | 2012-03-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Increasing minimum version of mail due to security vulnerability found in ↵ | Mikel Lindsaar | 2012-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Mail 2.4.1 for sendmail or exim | ||||
* | | | | | Merge pull request #5298 from sikachu/master-fix-responder | José Valim | 2012-03-06 | 3 | -12/+49 |
|\ \ \ \ \ | | | | | | | | | | | | | Always passing a respond block from to responder | ||||
| * | | | | | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -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 Visic | 2012-03-05 | 1 | -0/+36 |
| |/ / / / | |||||
* | | | | | Merge pull request #5296 from dlitz/relative_url_root_from_script_name | José Valim | 2012-03-06 | 3 | -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 Litzenberger | 2012-03-05 | 3 | -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/master | José Valim | 2012-03-05 | 2 | -3/+9 |
|\ \ \ \ | | | | | | | | | | | Added parsing of arbitrary media type parameters. | ||||
| * | | | | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127. | ||||
* | | | | | Add config.middleware.api_only! | Carlos Antonio da Silva and Santiago Pastorino | 2012-03-05 | 3 | -4/+42 |
| | | | | | |||||
* | | | | | Merge pull request #5288 from lest/patch-2 | José Valim | 2012-03-05 | 2 | -0/+17 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | force response body to be read in assert_template | ||||
| * | | | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 2 | -0/+17 |
|/ / / / | |||||
* | | | | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 3 | -1/+40 |
| | | | | | | | | | | | | | | | | builder |