Permalink
Switch branches/tags
Commits on Nov 7, 2011
Commits on Nov 6, 2011
  1. Implement a workaround for a bug in ruby-1.9.3p0.

    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.
    jonleighton committed Nov 6, 2011
  2. Merge pull request #3537 from dvyjones/refactor-pluralize-singularize

    Refactored pluralize and singularize into a common method
    josevalim committed Nov 6, 2011
  3. Refactored pluralize and singularize into a common method.

    See diff discussion on rails/#3536.
    henrikhodne committed Nov 6, 2011
  4. Merge pull request #3535 from jmazzi/master

    Update ActiveRecord#attribute_present? to work as documented
    jonleighton committed Nov 6, 2011
  5. Update ActiveRecord#attribute_present? to work as documented

    "Returns true if the specified attribute has been set by the user or by
    a database load and is neither nil nor empty?"
    
    Fixes #1613
    jmazzi committed Nov 6, 2011
  6. implements AR::Relation#explain

    This is a first implementation, EXPLAIN is highly
    dependent on the database and I have made some
    compromises.
    
    On one hand, the method allows you to run the most
    common EXPLAIN and that's it. If you want EXPLAIN
    ANALYZE in PostgreSQL you need to do it by hand.
    
    On the other hand, I've tried to construct a string
    as close as possible to the ones built by the
    respective shells. The rationale is that IMO the
    user should feel at home with the output and
    recognize it at first sight. Per database.
    
    I don't know whether this implementation is going
    to work well. Let's see whether people like it.
    fxn committed Sep 20, 2011
  7. Merge pull request #3534 from guilleiguaran/arel-git-gemfile

    Add arel to Gemfile on apps generated in edge Rails
    fxn committed Nov 6, 2011
Commits on Nov 5, 2011
  1. bumps up sprockets

    fxn committed Nov 5, 2011
  2. fixes typo

    fxn committed Nov 5, 2011
  3. implements AS::Notifications.subscribed, which provides subscriptions…

    … to events while a block runs
    fxn committed Nov 5, 2011
  4. Merge pull request #3525 from kennyj/fix_3440-1

    Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)
    jonleighton committed Nov 5, 2011
  5. Revert "Merge pull request #2378 from cesario/remove_warnings_activem…

    …odel"
    
    This reverts commit 6aaae3d, reversing
    changes made to fdbc4e5.
    
    Reason: build failure.
    jonleighton committed Nov 5, 2011
  6. Skip test_default_external_works on the CI for Ruby 1.9.3.

    This test is affected by a bug in Ruby 1.9.3p0 and trunk:
    http://redmine.ruby-lang.org/issues/5564
    
    Given we cannot fix it for ourselves, it is better to skip for now so
    that we will easily see if further failures are introduced.
    
    Jon Leighton is monitoring the bug report and will revert this when a
    suitable solution is found (either a new Ruby release or a generic
    workaround).
    
    If you are using 1.9.3 in your app and have templates that are not in
    UTF-8, you should add a workaround early on in the boot process. For
    example, if your templates are Shift_JIS encoded, then add the
    following in an initializer:
    
    Encoding::Converter.new('Shift_JIS', 'UTF-8')
    jonleighton committed Nov 5, 2011
  7. Merge pull request #2378 from cesario/remove_warnings_activemodel

    Remove warnings by calling remove_method
    vijaydev committed Nov 5, 2011
  8. Revert "outline two ways to invoke a custom active model validator"

    This reverts commit d163d3b.
    
    Reason: The alternate approach can be documented in the guide and
    not disrupt the existing flow in the readme.
    vijaydev committed Nov 5, 2011
  9. Revert "make the inline text a comment in the code block"

    This reverts commit 36a5f48.
    
    Reason: Editing .gitignore in docrails is not allowed. Docrails is meant
    only for documentation.
    vijaydev committed Nov 5, 2011
  10. Merge pull request #3529 from vjebelev/ar_ordered_indexes2

    AR changes to support creating ordered (asc, desc) indexes
    jonleighton committed Nov 5, 2011
  11. Fixed after_initialize/after_find guide

    Defining after_initialize and after_find as ordinary methods like documented
    in the guide doesn't work with Rails 3.1.1; now macro-style is used here, too.
    Florian Walch committed Nov 5, 2011
Commits on Nov 4, 2011
  1. Merge pull request #3517 from arunagw/test_fix_activerecord

    Fix test as one more has_many added
    jonleighton committed Nov 4, 2011
  2. Merge pull request #3516 from cesario/fix_gemspec

    Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md
    jonleighton committed Nov 4, 2011