aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update counter cache when pushing into associationMatthew Robertson2013-04-213-3/+22
* Merge pull request #10290 from buddhamagnet/masterSantiago Pastorino2013-04-211-1/+3
|\
| * extract path into variablebuddhamagnet2013-04-211-1/+3
|/
* Merge pull request #10289 from maratvmk/readmeSantiago Pastorino2013-04-211-2/+2
|\
| * fix README links in the main README.mdMarat Kazbekov2013-04-221-2/+2
|/
* Merge pull request #10286 from neerajdotname/fix-wrong-test-name-and-failure-...Carlos Antonio da Silva2013-04-211-2/+2
|\
| * fix wrong test description and failure messageNeeraj Singh2013-04-211-2/+2
* | Merge pull request #10284 from neerajdotname/missing-active-model-testsGuillermo Iguaran2013-04-211-0/+21
|\ \
| * | Added tests for if condition in Active Model callbacksNeeraj Singh2013-04-211-0/+21
| |/
* | Merge pull request #10283 from wangjohn/remove_tests_for_deprecated_optionsSantiago Pastorino2013-04-211-8/+0
|\ \
| * | Removing tests for deprecated options in active support. Thewangjohn2013-04-211-8/+0
|/ /
* | Merge pull request #10280 from vipulnsward/fix_typos_tempSteve Klabnik2013-04-212-2/+2
|\ \
| * | fix typosVipul A M2013-04-212-2/+2
* | | Merge pull request #10275 from buddhamagnet/masterCarlos Antonio da Silva2013-04-201-2/+1
|\ \ \
| * | | Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
|/ / /
* | | if singletons belong to the contract, test themXavier Noria2013-04-202-2/+5
* | | Rewrites a CHANGELOG entry.Xavier Noria2013-04-201-16/+6
|/ /
* | Merge pull request #10273 from prathamesh-sonpatki/AR-typosXavier Noria2013-04-191-2/+2
|\ \ | |/ |/|
| * Typo Fix in AR CHANGELOG [ci skip]Prathamesh Sonpatki2013-04-201-2/+2
|/
* Merge pull request #10211 from neerajdotname/4208Rafael Mendonça França2013-04-193-1/+41
|\
| * fix respond_to? for non selected columnNeeraj Singh2013-04-193-1/+41
|/
* Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-192-2/+2
|\
| * symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-192-2/+2
* | Merge pull request #10265 from wangjohn/documenting_actionviewRafael Mendonça França2013-04-194-0/+41
|\ \
| * | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-199-15/+66
|\ \ \
| * | | Revert "Merge pull request #10183 from jholton/fix_association_auto_save"Jon Leighton2013-04-193-29/+9
| * | | Merge pull request #10183 from jholton/fix_association_auto_saveJon Leighton2013-04-193-9/+29
| |\ \ \
| | * | | destroys association records before saving/inserting new association recordsJohnny Holton2013-04-193-9/+29
| |/ / /
| * | | Merge pull request #10264 from cconstantine/masterRafael Mendonça França2013-04-192-1/+7
| |\ \ \
| | * | | Fix loading of fixtures when the column type is a postgres array of strings.Chris Constantine2013-04-182-1/+7
| | |/ /
| * | | Improve the error messageRafael Mendonça França2013-04-192-2/+2
| * | | Merge pull request #10217 from mirasrael/make-migrator-run-transactional-4.0Rafael Mendonça França2013-04-193-5/+42
| |\ \ \
| | * | | Support transactions in Migrator.runbondarev2013-04-183-5/+42
| * | | | Merge pull request #10200 from calebthompson/ct-fix-freeze-freezing-cloned-mo...Jon Leighton2013-04-192-2/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix freeze applying to cloned objectsCaleb Thompson2013-04-152-2/+11
| * | | | Merge pull request #10235 from joergleis/patch-1Michael Koziarski2013-04-181-5/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Reorganize MessageEncryptorjgls2013-04-191-5/+4
| * | | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-2/+2
* | | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / / /
* | | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
* | | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
* | | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
* | | | Revert "Merge pull request #10043 from cconstantine/master"Rafael Mendonça França2013-04-182-21/+0
* | | | Use sprockets-rails 2.0.0.rc4Guillermo Iguaran2013-04-181-1/+1
* | | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
* | | | Use the same uglifier version that the generated applicationsRafael Mendonça França2013-04-181-1/+1
* | | | Use latest coffee-rails releaseRafael Mendonça França2013-04-182-2/+2
* | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
* | | | Bump arel to 4.0.0Rafael Mendonça França2013-04-181-1/+1