aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactored nested associations so they are more readable. Added commentswangjohn2013-03-081-26/+54
* Fix changelog indent, remove self from method call in changelog/doc examplesCarlos Antonio da Silva2013-03-082-4/+6
* The console --sandbox transaction should not be joinableJon Leighton2013-03-082-11/+10
* Make sure options is a hashRafael Mendonça França2013-03-081-1/+3
* Avoid short-circuit returnRafael Mendonça França2013-03-081-5/+9
* Merge pull request #9497 from route/subclass_from_attrsRafael Mendonça França2013-03-084-2/+22
|\
| * Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-064-2/+22
* | Merge pull request #9611 from choudhuryanupam/masterRafael Mendonça França2013-03-081-40/+40
|\ \
| * | Refactored test case with standard variable namingAnupam Choudhury2013-03-081-40/+40
|/ /
* | Fix rails console --sandboxJon Leighton2013-03-083-11/+79
* | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-083-0/+33
|\ \
| * | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-073-0/+32
* | | Merge pull request #8966 from cfabianski/disable_prepared_statement_when_prep...Rafael Mendonça França2013-03-086-3/+33
|\ \ \
| * | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-086-3/+33
| |/ /
* | | Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
* | | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-082-3/+2
* | | Write a more comprehensive CHANGELOG message [ci skip]Jon Leighton2013-03-081-3/+45
* | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-083-6/+22
|\ \ \ | |/ / |/| |
| * | Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-073-6/+22
* | | Fix warningsCarlos Antonio da Silva2013-03-071-2/+2
* | | Merge pull request #9605 from neerajdotname/sqlite-support-savepointCarlos Antonio da Silva2013-03-071-1/+2
|\ \ \
| * | | SQLite3 3.6.8+ supports savepointsNeeraj Singh2013-03-071-1/+2
| |/ /
* | | Fix hash spaces and use 1.9 style hash [ci skip]Carlos Antonio da Silva2013-03-071-1/+1
* | | Move AP changelog entry to the top [ci skip]Carlos Antonio da Silva2013-03-071-6/+6
|/ /
* | Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-075-2/+59
|\ \
| * | Allow use of assert_template with the :file option.Justin Coyne2013-03-015-2/+59
* | | Merge pull request #9597 from senny/9110_serialized_not_null_defaultRafael Mendonça França2013-03-074-0/+13
|\ \ \
| * | | test case for `serialize` default values.Yves Senn2013-03-074-0/+13
* | | | Merge pull request #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-075-3/+39
|\ \ \ \ | |/ / / |/| | |
| * | | cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-265-3/+39
* | | | Merge pull request #9474 from HonoreDB/masterRafael Mendonça França2013-03-073-0/+21
|\ \ \ \
| * | | | More helpful error message when instantiating an abstract classAaron Weiner2013-03-033-0/+21
* | | | | Merge pull request #9545 from senny/9535_secure_password_blankRafael Mendonça França2013-03-075-3/+75
|\ \ \ \ \
| * | | | | `has_secure_password` is not invalid when assigning empty Strings.Yves Senn2013-03-043-2/+24
| * | | | | `validates_confirmation_of` does not override writer methods.Yves Senn2013-03-043-1/+51
* | | | | | Merge pull request #9595 from senny/remove_non_breaking_spacesRafael Mendonça França2013-03-072-4/+4
|\ \ \ \ \ \
| * | | | | | replace non-breaking spaces with normal spaces [ci skip]Yves Senn2013-03-072-4/+4
* | | | | | | Merge pull request #9596 from choudhuryanupam/masterRafael Mendonça França2013-03-071-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactored and removed unnecessary lines in the test caseAnupam Choudhury2013-03-071-3/+3
|/ / / / / /
* | | | | | Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1aRafael Mendonça França2013-03-071-8/+0
* | | | | | debugger 1.4.0 works in Ruby 2.0Santiago Pastorino2013-03-061-1/+1
* | | | | | Merge pull request #9586 from robertomiranda/useless_trRafael Mendonça França2013-03-061-2/+2
|\ \ \ \ \ \
| * | | | | | Change useless tr to gsubrobertomiranda2013-03-061-2/+2
* | | | | | | Merge pull request #9538 from senny/remove_structure_dumpRafael Mendonça França2013-03-068-37/+24
|\ \ \ \ \ \ \
| * | | | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-063-2/+22
| * | | | | | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-066-35/+2
|/ / / / / / /
* | | | | | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-065-12/+97
|\ \ \ \ \ \ \
| * | | | | | | transactions can be turned off per Migration.Yves Senn2013-03-055-9/+90
| * | | | | | | transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
* | | | | | | | Merge pull request #9585 from RKushnir/patch-1Carlos Antonio da Silva2013-03-061-1/+1
|\ \ \ \ \ \ \ \