aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-213-1/+43
* Remove private partial/template renderer methodsCarlos Antonio da Silva2012-11-213-14/+3
* Merge branch 'deprecate-calculations-with-block'Carlos Antonio da Silva2012-11-216-49/+25
|\
| * Remove the #sum method from CollectionAssociationCarlos Antonio da Silva2012-11-211-9/+0
| * Deprecate Relation#sum with a block.Carlos Antonio da Silva2012-11-215-3/+22
| * Revert "Yield only one argument instead of splatting."Carlos Antonio da Silva2012-11-213-37/+3
|/
* Don't allocate new strings in compiled attribute methodsJon Leighton2012-11-213-21/+38
* Move migration test together with other join table testsCarlos Antonio da Silva2012-11-212-7/+6
* Use secure password min cost option in its own tests for a speed upCarlos Antonio da Silva2012-11-211-2/+10
* Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-213-11/+47
|\
| * Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-093-11/+47
* | Merge pull request #7716 from steveklabnik/issue_7715Rafael Mendonça França2012-11-212-1/+8
|\ \
| * | Coerce strings in create_join_table.Steve Klabnik2012-11-212-1/+8
* | | Merge pull request #8290 from cpatuzzo/masterCarlos Antonio da Silva2012-11-211-1/+1
|\ \ \
| * | | TypoChris Patuzzo2012-11-211-1/+1
|/ / /
* | | Merge pull request #6245 from bogdan/bc_timestampRafael Mendonça França2012-11-214-3/+24
|\ \ \
| * | | Fix postgresql adapter to handle bc timestamps correctlyBogdan Gusiev2012-11-214-3/+24
* | | | Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashedRafael Mendonça França2012-11-212-13/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Refactoring, testing and documenting pg_connection.distinctSemyon Perepelitsa2012-11-212-13/+39
|/ / /
* | | 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