Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 16, 2011
  1. Yehuda Katz

    Make the API for compression consistent between JS and CSS. By defaul…

    wycats authored
    …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.
  2. Santiago Pastorino

    Merge pull request #1728 from vijaydev/doc-merge-fix

    spastorino authored
    Doc merge fixes (3-1-stable)
  3. José Valim

    Merge pull request #1726 from arunagw/mysql_bump_3-1-stable

    josevalim authored
    Mysql bump to 0.3.5
  4. José Valim

    Merge pull request #1460 from SAP-Oxygen/27d7083addd1bc8ecf0ef258a50c…

    josevalim authored
    …5e36eb980060
    
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored
  5. Vijay Dev

    fix merge errors

    vijaydev authored
  6. Arun Agrawal

    Mysql bump

    arunagw authored
  7. Santiago Pastorino

    Merge pull request #1724 from brianmario/lazy-mysql2-casting

    spastorino authored
    re-enable eager-casting for mysql2
  8. Brian Lopez

    bump mysql2 version

    brianmario authored
  9. Brian Lopez

    on second thought, lets keep casting on by default. it can be disable…

    brianmario authored
    …d in database.yml by setting 'cast: false'
Commits on Jun 15, 2011
  1. José Valim
  2. Santiago Pastorino

    Merge pull request #1719 from ryanb/fix_generated_engine_javascript

    spastorino authored
    Fix generated JavaScript for mountable engine in 3-1-stable
  3. Ryan Bates
  4. Santiago Pastorino

    Merge pull request #1716 from ryanb/namespace_engine_assets_3_1

    spastorino authored
    Namespace engine assets for 3-1-stable
  5. Ryan Bates

    namespace engine assets

    ryanb authored
  6. José Valim

    Merge pull request #1713 from dmathieu/3-1-cherry

    josevalim authored
    Cherry picking encoding for 3.1
  7. Lukáš Konarovský Damien Mathieu

    Use assert_equal instead of assert in uploaded file test.

    daeltar authored dmathieu committed
  8. Damien Mathieu
  9. Damien Mathieu
  10. Damien Mathieu Andrew White

    simplify to only one condition

    dmathieu authored pixeltrix committed
    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
  11. Andrew White
Commits on Jun 14, 2011
  1. José Valim

    Merge pull request #1702 from brianmario/lazy-mysql2-casting

    josevalim authored
    Turn off mysql2's eager-casting
  2. Brian Lopez
  3. Brian Lopez

    Turn off eager casting for mysql2, so ActiveRecord can lazily cast va…

    brianmario authored
    …lues later. This should help performance for tables with complex types like DATETIME, TIMESTAMP
  4. Joshua Peek

    Fix appending sprockets paths

    josh authored
  5. Joseph Wong

    Patch for rails#1460

    jhtwong authored
    [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.
Commits on Jun 13, 2011
  1. Jon Leighton

    Add Gemfile dependency for require_relative on mri18. This is a depen…

    jonleighton authored
    …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.
  2. Andrew White
  3. Andrew White
  4. Andrew White
  5. José Valim

    Merge pull request #1675 from thoefer/3-1-stable

    josevalim authored
    Fix for startup problems due to deprecation warning on nested models
Commits on Jun 12, 2011
  1. thoefer2

    Make sure to have a Hash under the i18n keys 'activerecord.attributes…

    thoefer2 authored
    …' and 'activerecord.models' as this might not always be the case. See issue #1662.
  2. Jon Leighton

    Add support for using an ARCONFIG environment variable to specify the…

    jonleighton authored
    … location of the config.yml file for running the tests
  3. Jon Leighton
  4. Jon Leighton
  5. Jon Leighton

    Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a s…

    jonleighton authored
    …pecial case in assert_queries
Something went wrong with that request. Please try again.