aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | squelch an unused variable warningAaron Patterson2013-03-221-0/+1
|/ /
* | Remove exception variable from rescue blockCarlos Antonio da Silva2013-03-221-2/+2
* | Merge pull request #9866 from choudhuryanupam/fix_connection_testCarlos Antonio da Silva2013-03-221-1/+1
|\ \
| * | Removed unused loop variableAnupam Choudhury2013-03-221-1/+1
* | | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_testCarlos Antonio da Silva2013-03-221-2/+1
|\ \ \
| * | | Removed unnecessary blockAnupam Choudhury2013-03-221-2/+1
* | | | Merge pull request #9871 from arunagw/stringio-require-jrubyGuillermo Iguaran2013-03-221-0/+1
|\ \ \ \
| * | | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
| |/ / /
* | | | Don't kill the consoleJon Leighton2013-03-221-10/+2
* | | | Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_resetJon Leighton2013-03-221-0/+7
|\ \ \ \
| * | | | test-case to prevent resetting associations when preloading twice.Yves Senn2013-03-221-0/+7
|/ / / /
* | | | Merge pull request #9707 from route/updates_another_recordJon Leighton2013-03-224-2/+18
|\ \ \ \ | |/ / / |/| | |
| * | | When we pass id to update_attributes it will try to set new id for that recordDmitry Vorotilin2013-03-224-2/+18
|/ / /
* | | Send SIGTERM, not SIGQUIT.Jon Leighton2013-03-221-1/+1
* | | Delete failing testJon Leighton2013-03-221-36/+0
|/ /
* | Merge pull request #9863 from robertomiranda/require-bcrypt-rubyGuillermo Iguaran2013-03-211-2/+7
|\ \
| * | Change Standard error when is required bcrypt-ruby and failsrobertomiranda2013-03-211-2/+7
* | | Merge pull request #9861 from pivotalcommon/masterJeremy Kemper2013-03-212-1/+10
|\ \ \ | |/ / |/| |
| * | Allows setting fixture_path to a PathnameAlexander Murmann and Can Berk Güder2013-03-212-1/+10
|/ /
* | Merge pull request #9853 from wangjohn/adding_bang_to_raise_methodRafael Mendonça França2013-03-216-8/+8
|\ \
| * | Adding a bang to method name of raise_on_type_mismatch.wangjohn2013-03-216-8/+8
|/ /
* | Merge pull request #9836 from Intrepidd/tidy-requireCarlos Antonio da Silva2013-03-212-6/+3
|\ \
| * | Tidying up some require : removing useless sort and homogenizing with the res...Intrepidd2013-03-202-6/+3
* | | Merge pull request #9847 from vipulnsward/fix_sqlite_testRafael Mendonça França2013-03-212-3/+3
|\ \ \ | |_|/ |/| |
| * | Fix copy table index test; Change == to ! on false in travis.rbVipul A M2013-03-212-3/+3
* | | Merge pull request #7706 from iangreenleaf/multiple_counter_cachesJeremy Kemper2013-03-2011-9/+45
|\ \ \
| * | | Update other counter caches on destroyIan Young2013-03-2011-9/+45
| |/ /
* | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \ \
| * | | Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
* | | | Merge pull request #9837 from kjg/no_scaffold_css_when_no_assetsGuillermo Iguaran2013-03-203-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't generate a scaffold.css if no-assetsKevin Glowacz2013-03-203-1/+6
|/ / /
* | | use `connect_poll` on pg so that reaping does not hurt the connectionAaron Patterson2013-03-202-3/+4
* | | Revert "default the reaping frequency to 10 seconds"Aaron Patterson2013-03-201-1/+1
| |/ |/|
* | Merge pull request #9833 from choudhuryanupam/fix_active_schema_testCarlos Antonio da Silva2013-03-201-2/+1
|\ \
| * | Removed unnecessary blockAnupam Choudhury2013-03-201-2/+1
* | | Properly named variable inside blockAnupam Choudhury2013-03-201-2/+2
|/ /
* | Merge pull request #9821 from vipulnsward/fix_typos_in_ARVijay Dev2013-03-205-6/+6
|\ \
| * | Fix some typos in AR- CHANGELOG, tests, method doc. fixedVipul A M2013-03-205-6/+6
* | | Merge pull request #9825 from rShetty/patch-1Vijay Dev2013-03-201-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a typoRajeev N Bharshetty2013-03-201-1/+1
|/ /
* | Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_versionCarlos Antonio da Silva2013-03-191-1/+1
|\ \
| * | Changed the call to .sort.last to .max when computing the migration version. Youwangjohn2013-03-191-1/+1
* | | Merge pull request #9817 from knewter/fix-test-case-name-typo-in-arCarlos Antonio da Silva2013-03-191-2/+2
|\ \ \ | |/ / |/| |
| * | Commas aren't comas.Josh Adams2013-03-191-2/+2
|/ /
* | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ \
| * | Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
* | | Remove mentions of "app" from http request docs [ci skip]Carlos Antonio da Silva2013-03-191-12/+10
* | | Merge pull request #9816 from sebasoga/strong_parameters_guide_fixGuillermo Iguaran2013-03-191-1/+1
|\ \ \
| * | | Fix guides error on error class nameSebastian Sogamoso2013-03-191-1/+1
|/ / /
* | | Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470Jeremy Kemper2013-03-193-2/+38
|\ \ \