aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* included "Montevideo" in list of time zone aliases (closes Issue #9628)Gernot2013-03-091-0/+1
* Fix AMo code example indent, add missing author to entry [ci skip]Carlos Antonio da Silva2013-03-091-6/+8
* Bump up timeoutsJon Leighton2013-03-091-3/+3
* Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_offSteve Klabnik2013-03-091-4/+4
|\
| * Renumbering the comments in the application boot process.wangjohn2013-03-091-4/+4
|/
* Merge pull request #9627 from rubys/masterCarlos Antonio da Silva2013-03-091-0/+1
|\
| * ensure response.stream is closedSam Ruby2013-03-091-0/+1
|/
* Merge pull request #9621 from sakuro/migration-magic-comment-fixJeremy Kemper2013-03-094-3/+48
|\
| * Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
* | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-1/+24
|\ \
| * | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-083-1/+24
* | | Merge pull request #9623 from Agis-/patch-2Carlos Antonio da Silva2013-03-091-2/+2
|\ \ \ | |_|/ |/| |
| * | Remove extra whitespace and fix a commentAgis Anastasopoulos2013-03-091-2/+2
|/ /
* | Fix failing test regarding console change to fix sandboxingCarlos Antonio da Silva2013-03-081-11/+10
* | Merge pull request #8670 from sanemat/fix/rake-descVijay Dev2013-03-081-0/+2
|\ \
| * | Add rake test descriptionsanemat2013-01-011-0/+2
* | | Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_re...Rafael Mendonça França2013-03-081-26/+54
|\ \ \
| * | | 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
|\ \ \ \ \ \