Permalink
Commits on Dec 31, 2012
  1. Merge remote-tracking branch 'upstream/master'

    Bradley J. Spaulding committed Dec 31, 2012
  2. @spastorino

    Define [], []=, permanent, signed and encrypted as the only allowed m…

    …ethods for the non Raw Cookie classes
    spastorino committed Dec 31, 2012
  3. @spastorino

    Merge pull request #8546 from hsbt/fix-testcase-strict-warning

    fix testcase: ruby-2.0.0 warned unused variables
    spastorino committed Dec 31, 2012
Commits on Dec 30, 2012
  1. @guilleiguaran

    Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test agai…

    …nst Rack master"
    
    This reverts commit fba97c9.
    guilleiguaran committed Dec 30, 2012
  2. @spastorino
  3. @rafaelfranca

    Merge pull request #8651 from tjouan/activerecord-structure_dump-endi…

    …ng_nl
    
    Fix missing ending newline in db structure dump:
    rafaelfranca committed Dec 30, 2012
  4. @spastorino
  5. @tjouan

    Fix missing ending newline in db structure dump:

      When dumping database structure with `rake db:structure:dump` and
    using migrations, the resulting file will not end with a newline char.
    Although it's not mandatory, it breaks a lot of simple use cases with
    programs like cat, more, grep, etc.
    
      This changes use `puts' instead of `<<' to append migration versions
    data to the dump and also split the line where this is happening as it
    was a bit long.
    tjouan committed Dec 27, 2012
  6. @guilleiguaran

    Merge pull request #8656 from arunagw/warning_removed_shadowing_var

    warning removed: shadowing outer local variable
    guilleiguaran committed Dec 30, 2012
  7. @arunagw
Commits on Dec 29, 2012
  1. @vijaydev

    Merge pull request #8647 from nishantmodak/patch-2

    Update documentation for yml usage
    vijaydev committed Dec 29, 2012
  2. @spastorino
  3. @nishantmodak
  4. @guilleiguaran

    Merge pull request #8650 from codeodor/patch-1

    Fix up/down column change example code formatting
    guilleiguaran committed Dec 29, 2012
  5. @codeodor
  6. @tenderlove
  7. @tenderlove
  8. @tenderlove
  9. @jeremy

    Test that assert_not returns true. Use assert_raises instead of doing…

    … begin/rescue/else.
    jeremy committed Dec 29, 2012
  10. @tenderlove

    fix PG typecasting errors

    tenderlove committed Dec 29, 2012
Commits on Dec 28, 2012
  1. @rafaelfranca

    Merge pull request #8644 from acapilleri/abstract_mysql

    small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter
    rafaelfranca committed Dec 28, 2012
  2. @acapilleri
  3. @rafaelfranca

    Merge pull request #8636 from senny/work_off_fixme_in_rename_column_test

    work off FIXME in rename_column_test
    rafaelfranca committed Dec 28, 2012
  4. @senny

    work off FIXME comments in AR rename_column_test.rb

    There were a couple of tests, which had FIXME comments in palce of
    assertions. I replaced these FIXME comments with actual assertions to
    get more feedback from our test suite.
    senny committed Dec 28, 2012
  5. @jeremy

    Revert "Install binstubs by default"

    This reverts commit f34c27a.
    
    We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
    jeremy committed Dec 28, 2012
  6. @jeremy

    Revert "Detect rbenv and update the shebang"

    This reverts commit 7173c4f.
    This reverts commit a562f9f.
    jeremy committed Dec 28, 2012
  7. @vijaydev
  8. @vijaydev

    Revert "Add rake test description"

    This reverts commit a3309ca.
    
    Reason: docrails isn't the place to do this.
    
    [ci skip]
    vijaydev committed Dec 28, 2012
  9. @vijaydev

    Revert "Add rake default to description"

    This reverts commit 0d8ca81.
    
    Reason: docrails isn't the place to do this. Also, I feel this is
    not really required.
    
    [ci skip]
    vijaydev committed Dec 28, 2012
  10. @vijaydev

    Revert "reminder to run bundle after setting up rails-dev-box"

    This reverts commit 41381c1.
    
    Reason: This doesn't quite fit the flow where it's added. Let's add this
    someplace else if it's explicitly required.
    
    [ci skip]
    vijaydev committed Dec 28, 2012
  11. @steveklabnik

    Merge pull request #8641 from arunagw/warning_removed_unused_var

    Remove 'assigned but unused variable' warning
    steveklabnik committed Dec 28, 2012
  12. @arunagw
  13. @jeremy
Commits on Dec 27, 2012
  1. @jeremy
  2. @rafaelfranca

    Merge pull request #8634 from senny/rewrite_order_dependent_test_case

    rewrite order dependent test case
    rafaelfranca committed Dec 27, 2012