aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* In a nested resource route, the parent resource param is <resource_name>_idVijay Dev2012-03-091-8/+8
* Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-091-1/+1
* Fix typo in isolated engine docsCaius Durling2012-03-091-1/+1
* Fix typo in asset pipeline guideMatthew Conway2012-03-091-1/+1
* Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
* Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.Swanand Pagnis2012-03-091-1/+1
* typoMikhail Dieterle2012-03-091-1/+1
* Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-091-8/+10
* Add tests to test that through associations are not readonly, and we can upda...kuahyeow2012-03-081-0/+11
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
* Remove usage of deprecated module.José Valim2012-03-071-1/+0
* Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
* 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
* Deprecate ActionController::SessionManagementSantiago Pastorino2012-03-061-0/+5
* 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 #5299 from sikachu/3-2-stable-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
|/
* Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-053-1/+40
* Merge pull request #5278 from rafaelfranca/fix-build-3-2Michael Koziarski2012-03-044-2/+9
|\
| * Now all the models need to explicitly declare the accessible attributesRafael Mendonça França2012-03-041-0/+1
| * Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-043-2/+8
|/
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-054-1/+20
* Only run binary type cast test with encode! on Ruby 1.9Carlos Antonio da Silva2012-03-041-6/+8
* fix associations when using per class databasesLars Kanis2012-03-043-8/+5
* CSS fix for guides. Closing #5028 [ci skip]Vijay Dev2012-03-031-1/+1
* Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-032-1/+4
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
* Add CHANGELOG entrySantiago Pastorino2012-03-021-0/+6
* Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
* Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-0114-39/+81
|\
| * bumping to 3.2.2Aaron Patterson2012-03-019-9/+9
| * Merge branch '3-2-stable-security' into 3-2-2Aaron Patterson2012-03-015-30/+72
| |\
| | * Ensure [] respects the status of the buffer.José Valim2012-02-292-17/+49
| | * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| | * use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| | * fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| * | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| * | updating RAILS_VERSIONAaron Patterson2012-02-229-17/+17
* | | Merge pull request #5206 from kennyj/fix_5173-32Aaron Patterson2012-02-293-12/+23
|\ \ \
| * | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-293-12/+23
|/ / /
* | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
* | | Merge pull request #5190 from rafaelfranca/fix-393-3-2-stableAaron Patterson2012-02-273-38/+38
|\ \ \
| * | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38