Permalink
Commits on Jun 16, 2011
  1. Make the API for compression consistent between JS and CSS. By defaul…

    …t, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.
    
    Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
    wycats committed Jun 16, 2011
  2. Merge pull request #1728 from vijaydev/doc-merge-fix

    Doc merge fixes (3-1-stable)
    spastorino committed Jun 16, 2011
  3. Merge pull request #1726 from arunagw/mysql_bump_3-1-stable

    Mysql bump to 0.3.5
    josevalim committed Jun 16, 2011
  4. Merge pull request #1460 from SAP-Oxygen/27d7083addd1bc8ecf0ef258a50c…

    …5e36eb980060
    
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored
    josevalim committed Jun 16, 2011
  5. fix merge errors

    vijaydev committed Jun 16, 2011
  6. Mysql bump

    arunagw committed Jun 16, 2011
  7. Merge pull request #1724 from brianmario/lazy-mysql2-casting

    re-enable eager-casting for mysql2
    spastorino committed Jun 16, 2011
  8. bump mysql2 version

    brianmario committed Jun 16, 2011
  9. on second thought, lets keep casting on by default. it can be disable…

    …d in database.yml by setting 'cast: false'
    brianmario committed Jun 16, 2011
Commits on Jun 15, 2011
  1. Merge pull request #1719 from ryanb/fix_generated_engine_javascript

    Fix generated JavaScript for mountable engine in 3-1-stable
    spastorino committed Jun 15, 2011
  2. Merge pull request #1716 from ryanb/namespace_engine_assets_3_1

    Namespace engine assets for 3-1-stable
    spastorino committed Jun 15, 2011
  3. namespace engine assets

    ryanb committed Jun 15, 2011
  4. Merge pull request #1713 from dmathieu/3-1-cherry

    Cherry picking encoding for 3.1
    josevalim committed Jun 15, 2011
  5. simplify to only one condition

    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
    dmathieu committed with pixeltrix Jun 15, 2011
Commits on Jun 14, 2011
  1. Merge pull request #1702 from brianmario/lazy-mysql2-casting

    Turn off mysql2's eager-casting
    josevalim committed Jun 14, 2011
  2. Turn off eager casting for mysql2, so ActiveRecord can lazily cast va…

    …lues later. This should help performance for tables with complex types like DATETIME, TIMESTAMP
    brianmario committed Jun 14, 2011
  3. Fix appending sprockets paths

    josh committed Jun 14, 2011
  4. Patch for rails#1460

    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
    rake tasks ignored
    
    Working with the new support for plugins inside engines in Rails 3.1,
    I found that certain things that work for regular plugins don't work
    for these new nested plugins. In particular, these methods in
    Rails::Engine don't seem to understand that an engine could have
    nested plugins:
    
    #load_tasks
    #load_generators
    #load_console
    #eager_load!
    
    A solution which worked out for me is to move the calls to
    railties.all { ... } from the overriding methods in Rails::Application
    into Rails::Engine.
    jhtwong committed Jun 14, 2011
Commits on Jun 13, 2011
  1. Add Gemfile dependency for require_relative on mri18. This is a depen…

    …dency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.
    jonleighton committed Jun 13, 2011
  2. Merge pull request #1675 from thoefer/3-1-stable

    Fix for startup problems due to deprecation warning on nested models
    josevalim committed Jun 13, 2011
Commits on Jun 12, 2011
  1. Make sure to have a Hash under the i18n keys 'activerecord.attributes…

    …' and 'activerecord.models' as this might not always be the case. See issue #1662.
    thoefer2 committed Jun 12, 2011
  2. Add support for using an ARCONFIG environment variable to specify the…

    … location of the config.yml file for running the tests
    jonleighton committed Jun 12, 2011
  3. Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a s…

    …pecial case in assert_queries
    jonleighton committed Jun 12, 2011