Skip to content
Commits on Mar 9, 2013
  1. @carlosantoniodasilva
Commits on Mar 8, 2013
  1. @vijaydev

    Merge pull request #8670 from sanemat/fix/rake-desc

    vijaydev committed Mar 8, 2013
    Add rake test description
  2. @rafaelfranca

    Merge pull request #9614 from wangjohn/refactoring_nested_association…

    rafaelfranca committed Mar 8, 2013
    …s_for_readability
    
    Refactored nested associations so they are more readable.
  3. @wangjohn

    Refactored nested associations so they are more readable. Added comments

    wangjohn committed Mar 8, 2013
    which make it clearer about what's going on.
  4. @carlosantoniodasilva
  5. @jonleighton

    The console --sandbox transaction should not be joinable

    jonleighton committed Mar 8, 2013
    Thanks @neerajdotname for noticing this bug.
  6. @rafaelfranca
  7. @rafaelfranca
  8. @rafaelfranca

    Merge pull request #9497 from route/subclass_from_attrs

    rafaelfranca committed Mar 8, 2013
    Fix ActiveRecord `subclass_from_attrs` when eager_load is false.
    
    Conflicts:
    	activerecord/CHANGELOG.md
  9. @rafaelfranca

    Merge pull request #9611 from choudhuryanupam/master

    rafaelfranca committed Mar 8, 2013
    Refactored test case with standard variable names
  10. @anupamc
  11. @jonleighton

    Fix rails console --sandbox

    jonleighton committed Mar 8, 2013
    I've also added a proper acceptance test which reproduced the issue.
    
    Closes #9513, #9515.
  12. @rafaelfranca

    Merge pull request #8868 from tehgeekmeister/master

    rafaelfranca committed Mar 8, 2013
    Use the index name explicitly provided in a migration when reverting.
    
    Fixes #8868
    
    Conflicts:
    	activerecord/CHANGELOG.md
  13. @rafaelfranca

    Merge pull request #8966 from cfabianski/disable_prepared_statement_w…

    rafaelfranca committed Mar 8, 2013
    …hen_preparing_a_query
    
    Unprepared Visitor + unprepared_statement
    
    Conflicts:
    	activerecord/CHANGELOG.md
  14. @carlosantoniodasilva

    Merge pull request #9609 from arunagw/using-latest-arjdbc

    carlosantoniodasilva committed Mar 8, 2013
    Using latest AR-JDBC for JRuby
  15. @carlosantoniodasilva

    Update test name to reflect change in how scopes merging works

    carlosantoniodasilva committed Mar 8, 2013
    Introduced in f1082b8.
    Full changelog in 9f007d7.
    
    [ci skip]
  16. @jonleighton
  17. @jonleighton

    Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where

    jonleighton committed Mar 8, 2013
    7365 merging scopes for where clauses
  18. Unprepared Visitor + unprepared_statement

    Cédric FABIANSKI committed Jan 16, 2013
  19. @tehgeekmeister

    If an index can't be found by column, use the index name.

    tehgeekmeister committed Jan 10, 2013
    schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858.  this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
  20. @carlosantoniodasilva

    Fix warnings

    carlosantoniodasilva committed Mar 7, 2013
  21. @carlosantoniodasilva

    Merge pull request #9605 from neerajdotname/sqlite-support-savepoint

    carlosantoniodasilva committed Mar 7, 2013
    SQLite3 3.6.8+ supports savepoints
Commits on Mar 7, 2013
  1. Combine scope conditions using AND

    Neeraj Singh and John Leighton committed Mar 7, 2013
    Currently Post.active.inactive will result in Post.inactive since
    the last where clause wins when scopes are merged.
    
    This pull request will merge all scopes ( barring defaul scope)
    using AND.
    
    The default scope will be overridden if another scope acts on the
    same where clause.
    
    closes #7365
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva
  4. @rafaelfranca

    Merge pull request #9464 from jcoyne/assert_template_file

    rafaelfranca committed Mar 7, 2013
    Allow use of assert_template with the :file option.
  5. @rafaelfranca

    Merge pull request #9597 from senny/9110_serialized_not_null_default

    rafaelfranca committed Mar 7, 2013
    test case for `serialize` default values.
  6. @rafaelfranca

    Merge pull request #9105 from bemurphy/cache_key_updated_on

    rafaelfranca committed Mar 7, 2013
    cache_key consults updated_on timestamp if present
    
    Conflicts:
    	activerecord/CHANGELOG.md
  7. @senny

    test case for `serialize` default values.

    senny committed Feb 4, 2013
    Closes #9110
  8. @rafaelfranca

    Merge pull request #9474 from HonoreDB/master

    rafaelfranca committed Mar 7, 2013
    More helpful error message when instantiating an abstract class
    
    Conflicts:
    	activerecord/CHANGELOG.md
  9. @rafaelfranca

    Merge pull request #9545 from senny/9535_secure_password_blank

    rafaelfranca committed Mar 7, 2013
    `has_secure_password` is not invalid when assigning empty Strings
  10. @rafaelfranca

    Merge pull request #9595 from senny/remove_non_breaking_spaces

    rafaelfranca committed Mar 7, 2013
    replace non-breaking spaces with normal spaces [ci skip]
  11. @rafaelfranca

    Merge pull request #9596 from choudhuryanupam/master

    rafaelfranca committed Mar 7, 2013
    Refactored the code to remove irrelevant lines
  12. @anupamc
Something went wrong with that request. Please try again.