aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove return guard and use code convetionsRafael Mendonça França2012-11-201-7/+11
* Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
|\
| * fix guide with field_with_error proc exampleAditya Sanghi2012-11-201-2/+6
* | Merge pull request #8282 from arunagw/warning_removed_for_ruby2Carlos Antonio da Silva2012-11-201-0/+2
|\ \
| * | Initialize accessors to remove some warnings in Ruby 2.0Arun Agrawal2012-11-211-0/+2
|/ /
* | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
|\ \ | |/ |/|
| * Postgresql doesn't accepts limits on text columns.Victor Costan2012-11-204-0/+35
|/
* Merge pull request #8279 from gaurish/database_errorCarlos Antonio da Silva2012-11-201-0/+4
|\
| * Better Error handling when parsing database.yamlGaurish Sharma2012-11-201-0/+4
|/
* Merge branch 'url-for-params'Carlos Antonio da Silva2012-11-193-2/+16
|\
| * Correct the use of params options when given to url_forCarlos Antonio da Silva2012-11-193-10/+16
| * Fix issue with params in url_fortumayun2012-11-192-1/+9
|/
* Refactor request tests, remove #with_set methodCarlos Antonio da Silva2012-11-191-8/+3
* Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
* Merge pull request #8212 from senny/8197_make_render_in_spacer_template_workJosé Valim2012-11-193-2/+18
|\
| * render every partial with a new `PartialRenderer`.Yves Senn2012-11-193-2/+18
|/
* Merge pull request #8044 from nateberkopec/block_does_not_set_parts_orderRafael Mendonça França2012-11-194-46/+31
|\
| * Explicit multipart messages respect :parts_orderNate Berkopec2012-11-194-46/+31
* | Add UpgradeSignatureToEncryptionCookieStore to upgrading_ruby_on_rails guideSantiago Pastorino2012-11-191-0/+2
* | Fix UpgradeSignatureToEncryptionCookieStore docSantiago Pastorino2012-11-191-9/+4
|/
* Remove not needed begin..end from AR#saveCarlos Antonio da Silva2012-11-191-5/+3
* Initialize accessors to remove some warnings in Ruby 2.0Carlos Antonio da Silva2012-11-192-7/+4
* Merge pull request #8262 from senny/8229_correct_bundler_require_in_enginesRafael Mendonça França2012-11-192-3/+8
|\
| * require bundler groups to include rake-tasks in enginesYves Senn2012-11-182-1/+6
| * cleanup, remove whitspace from railties CHANGELOGYves Senn2012-11-181-2/+2
* | Merge pull request #8256 from nalwayaabhishek/masterCarlos Antonio da Silva2012-11-191-3/+3
|\ \
| * | displaying error message(p tag was missing) and adding output as comment Abhishek Nalwaya2012-11-191-3/+3
* | | Refactor config abort message a bit for dbconsoleCarlos Antonio da Silva2012-11-182-8/+4
* | | Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-182-5/+13
* | | Merge pull request #3023 from Tho85/preserve_sti_typeRafael Mendonça França2012-11-183-2/+31
|\ \ \
| * | | AR::Base.becomes should not change the STI typeThomas Hollstegge2012-11-173-2/+31
* | | | Merge pull request #8266 from CvX/index_renameRafael Mendonça França2012-11-183-0/+23
|\ \ \ \
| * | | | Add rename_index to change_table.Jarek Radosz2012-11-193-0/+23
|/ / / /
* | | | Merge branch 'deprecate-pending'Carlos Antonio da Silva2012-11-184-2/+24
|\ \ \ \
| * | | | Properly deprecate #pending from AS::TestCaseCarlos Antonio da Silva2012-11-183-8/+10
| * | | | Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending"Carlos Antonio da Silva2012-11-183-2/+22
|/ / / /
* | | | Ensure ordering to make the test pass with postgresqlCarlos Antonio da Silva2012-11-181-4/+5
* | | | Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-181-0/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add test to ensure preloading works as expected with "select" and "includes".Dieter Komendera2012-11-181-0/+13
| | |/ | |/|
* | | Merge pull request #8260 from sauliusg/improved_deprecation_noticeRafael Mendonça França2012-11-181-4/+6
|\ \ \
| * | | Point user to strong_parameters as the new protection model [ci skip]Saulius Grigaliunas2012-11-181-4/+6
| |/ /
* | | Merge pull request #8259 from senny/make_queued_message_autoloadableRafael Mendonça França2012-11-181-0/+1
|\ \ \ | |/ / |/| |
| * | make ActionMailer::QueuedMessage autoloadableYves Senn2012-11-181-0/+1
|/ /
* | Upgrade mail dependency to 2.5.2Mikel Lindsaar2012-11-181-1/+1
* | Remove not used require and some useless test commentsCarlos Antonio da Silva2012-11-172-14/+3
* | Bump mysql gem version to the newly 2.9.0, fix build.Carlos Antonio da Silva2012-11-172-2/+2
* | Upgrade mail dependency to 2.5.0Mikel Lindsaar2012-11-181-1/+1
* | Initialize #min_cost to avoid warning in Ruby 2.0Carlos Antonio da Silva2012-11-171-2/+3
* | Fix typo in module name and make #in_time_zone privateCarlos Antonio da Silva2012-11-173-3/+5
* | Extract #in_time_zone helper method duplication to a moduleCarlos Antonio da Silva2012-11-173-24/+17