aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5287 from nashby/hash-slice-extractAaron Patterson2012-03-082-8/+11
|\
| * refactor Hash#slice and Hash#extract!Vasiliy Ermolovich2012-03-062-8/+11
* | Merge pull request #5306 from kennyj/fix_69c7f02José Valim2012-03-082-2/+2
|\ \
| * | Change the string to use in test case.kennyj2012-03-072-2/+2
* | | Merge pull request #5336 from kennyj/fix_wrong_extensionXavier Noria2012-03-081-1/+1
|\ \ \
| * | | 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
|\ \ \
| * | | 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
* | | | Merge pull request #5162 from kennyj/schema_cache_dumpAaron Patterson2012-03-079-18/+173
|\ \ \ \
| * | | | 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
* | | | | Revert "updates the new default pool size in some additional places"Xavier Noria2012-03-073-17/+7
* | | | | Add tests to test that through associations are not readonly, and we can upda...kuahyeow2012-03-081-0/+11
* | | | | Merge pull request #5315 from travisjeffery/enhance_postgresql_adapter_schema...Aaron Patterson2012-03-072-2/+62
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 #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