aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-183-1/+21
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-163-1/+21
* | | | | Merge pull request #9763 from vipulnsward/fix_transliterate_testCarlos Antonio da Silva2013-03-182-2/+2
|\ \ \ \ \
| * | | | | fix repeat of test; remove unused variable by use of each_keyVipul A M2013-03-182-2/+2
* | | | | | Merge pull request #9766 from senny/remove_ancient_todosCarlos Antonio da Silva2013-03-183-6/+0
|\ \ \ \ \ \
| * | | | | | remove ancient TODOs [ci skip].Yves Senn2013-03-183-6/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9771 from vipulnsward/fix_typos_activemodel_v1Carlos Antonio da Silva2013-03-183-4/+4
|\ \ \ \ \ \
| * | | | | | fix some typos found in activemodelVipul A M2013-03-183-4/+4
| |/ / / / /
* | | | | | Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrbCarlos Antonio da Silva2013-03-182-14/+14
|\ \ \ \ \ \
| * | | | | | move tests out from base_test.rbTakehiro Adachi2013-03-182-14/+14
| |/ / / / /
* | | | | | Merge pull request #9677 from neerajdotname/update-comments-about-kotoriCarlos Antonio da Silva2013-03-181-1/+1
|\ \ \ \ \ \
| * | | | | | SQLite3 3.6.8+ supports nested transactions [ci skip]Neeraj Singh2013-03-181-1/+1
* | | | | | | Merge pull request #9773 from senny/how_to_report_an_issueXavier Noria2013-03-181-3/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | refer to the contributing guide on how to create issues.Yves Senn2013-03-181-3/+5
|/ / / / / /
* | | | | | Merge pull request #9762 from senny/8079_do_not_grant_on_root_userRafael Mendonça França2013-03-173-3/+26
|\ \ \ \ \ \
| * | | | | | `rake db:create` does not change permissions of root user.Yves Senn2013-03-173-3/+26
|/ / / / / /
* | / / / / sets limit 191 for schema_migrations#version in mysql2 if the encoding is "ut...Xavier Noria2013-03-174-5/+58
| |/ / / / |/| | | |
* | | | | Merge pull request #9754 from macksmind/fix_actionpack_warningsRafael Mendonça França2013-03-172-2/+3
|\ \ \ \ \
| * | | | | Fix rake test warnings in actionpackMack Earnhardt2013-03-172-2/+3
* | | | | | Merge pull request #9757 from vipulnsward/remove_message_paramCarlos Antonio da Silva2013-03-171-1/+1
|\ \ \ \ \ \
| * | | | | | remove unused parameter passed to assert_query_equal methodVipul A M2013-03-171-1/+1
| |/ / / / /
* | | | | | Merge pull request #9745 from madmax/allow_pass_multipart_to_form_forCarlos Antonio da Silva2013-03-172-3/+3
|\ \ \ \ \ \
| * | | | | | Allow pass multipart option to form_forGrzegorz Derebecki2013-03-172-3/+3
* | | | | | | Merge pull request #9758 from vipulnsward/remove_from_rakefileCarlos Antonio da Silva2013-03-171-2/+0
|\ \ \ \ \ \ \
| * | | | | | | extra lines from Rakefile removed, which also threw warningVipul A M2013-03-171-2/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #9759 from vipulnsward/remove_hash_from_testsCarlos Antonio da Silva2013-03-171-16/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | refactor test to drop unnecessary hash creation, test directly insteadVipul A M2013-03-171-16/+10
|/ / / / / /
* | | | | | Merge pull request #9747 from macksmind/refactor_friend_followerRafael Mendonça França2013-03-166-6/+15
|\ \ \ \ \ \
| * | | | | | Refactor Person/Friendship relationships to be more intuitiveMack Earnhardt2013-03-176-6/+15
|/ / / / / /
* | | / / / Getting Started Guide: typo fix. [ci skip]Steve Klabnik2013-03-161-1/+1
| |_|/ / / |/| | | |
* | | | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-163-8/+1
* | | | | Update image in Getting Started Guide [ci skip]Steve Klabnik2013-03-161-0/+0
* | | | | revises the CHANGELOG entry from 26aa265 [ci skip]Xavier Noria2013-03-161-2/+3
* | | | | Merge pull request #8156 from fredwu/acronym_fix-masterXavier Noria2013-03-163-1/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added Inflector#underscore fix to the changelogFred Wu2013-03-171-0/+4
| * | | | Fixed a bug where the inflector would replace camelCase strings and disregard...Fred Wu2013-03-172-1/+3
|/ / / /
* | | | fixes markup of the CHANGELOG entry from 455d710Xavier Noria2013-03-161-14/+14
* | | | Merge pull request #9737 from wangjohn/counter_cache_update_attributes_fixJeremy Kemper2013-03-153-0/+77
|\ \ \ \
| * | | | If a counter_cache is defined, then using update_attributes and changingJohn Wang2013-03-153-0/+77
|/ / / /
* | | | Merge pull request #9734 from choudhuryanupam/masterRafael Mendonça França2013-03-151-2/+2
|\ \ \ \
| * | | | Refactored to reuse methodAnupam Choudhury2013-03-151-2/+2
* | | | | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-156-47/+5
* | | | | Merge pull request #5606 from teohm/multipart_unicode_param_nameSteve Klabnik2013-03-156-32/+54
|\ \ \ \ \
| * | | | | UTF-8 encode all keys and values in nested params hash.Teo Hui Ming2013-03-156-32/+54
* | | | | | Fix implicit join references option reversion in testCarlos Antonio da Silva2013-03-151-1/+2
* | | | | | Merge pull request #9691 from hone/stdout_loggingSteve Klabnik2013-03-156-5/+47
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | make new rails apps log to STDOUTTerence Lee2013-03-156-5/+47
* | | | | | Merge pull request #9733 from senny/9712_option_to_turn_references_deprecatio...Jon Leighton2013-03-154-2/+38
|\ \ \ \ \ \
| * | | | | | make it possible to disable implicit join references.Yves Senn2013-03-154-2/+38
| | |_|/ / / | |/| | | |
* / | | | | Cache the association proxy objectJon Leighton2013-03-152-1/+6
|/ / / / /