aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #5307Carlos Antonio da Silva2012-03-071-2/+6
* | fixes #4506 [ci skip]Vijay Dev2012-03-071-1/+1
* | Merge pull request #5305 from arunagw/warning_fixVijay Dev2012-03-071-1/+1
|\ \ | |/ |/|
| * 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 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 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
* | | Merge pull request #5304 from kennyj/fix_connection_dependencyAaron Patterson2012-03-062-2/+2
|\ \ \ | |_|/ |/| |
| * | 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 Mai...Mikel Lindsaar2012-03-061-1/+1
* | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\ \
| * | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| * | 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 ENV["RAILS_RELATIVE_URL_ROOT"] is not...Dwayne Litzenberger2012-03-053-1/+104
|/
* Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\
| * Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
* | 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_templateSergey Nartimov2012-03-052-0/+17
|/ /
* | Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-053-1/+40
* | Merge pull request #5274 from tigrish/masterJosé Valim2012-03-052-1/+20
|\ \
| * | Tweak activerecord/test/cases/validations/i18n_generate_message_validation_te...Christopher Dell2012-03-051-1/+2
| * | Test that RecordInvalid exception's translation falls back to the :errors nam...Christopher Dell2012-03-051-0/+18
| * | Allow translations of activerecord.errors.messages.record_invalid to be looke...Christopher Dell2012-03-051-1/+1
* | | Merge pull request #5281 from filipeamoreira/patch-1Vijay Dev2012-03-051-1/+1
|\ \ \
| * | | Small typo fixFilipe Moreira2012-03-051-1/+1
* | | | minor corrections in AMo::Model docs [ci skip]Vijay Dev2012-03-052-5/+5
* | | | document the shortcut to the root route helper [ci skip]Vijay Dev2012-03-052-0/+3
| |_|/ |/| |
* | | Fix typoSantiago Pastorino2012-03-051-1/+1
|/ /
* | Add a new guide for API-only applicationsJose and Yehuda2012-03-041-0/+277
* | Merge pull request #5277 from rafaelfranca/fix-buildMichael Koziarski2012-03-041-0/+1
|\ \
| * | Now all the models need to explicitly declare the accessible attributesRafael Mendonça França2012-03-041-0/+1
|/ /
* | Merge pull request #5275 from rafaelfranca/masterJon Leighton2012-03-043-2/+11
|\ \
| * | Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-043-2/+11
|/ /
* | Whitelist all attribute assignment by default.Michael Koziarski2012-03-054-1/+20
* | Fix tests, table_name= needs connection now, so just stub table_namePiotr Sarnacki2012-03-041-1/+1
* | Merge pull request #5271 from carlosantoniodasilva/ar-fix-buildJosé Valim2012-03-042-2/+2
|\ \ | |/ |/|
| * Fix message assertions for quoting database name in "show tables" for mysqlCarlos Antonio da Silva2012-03-042-2/+2
|/
* Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warningJon Leighton2012-03-043-1/+10
|\