Permalink
Commits on May 14, 2012
  1. Merge pull request #6018 from lest/patch-1

    mailer can be anonymous
    carlosantoniodasilva committed May 14, 2012
  2. Update railties/lib/rails/generators/rails/app/templates/config/appli…

    …cation.rb
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    homakov committed with josevalim May 12, 2012
  3. Merge pull request #6266 from alexeymuranov/remove_unused_private_method

    Remove unused private method
    carlosantoniodasilva committed May 14, 2012
Commits on May 13, 2012
  1. Merge pull request #3237 from sakuro/data-url-scheme

    Support data: url scheme
    rafaelfranca committed May 13, 2012
  2. Merge pull request #6306 from erichmenge/3-2-stable-guide-fix

    3 2 stable guide fix [ci skip]
    carlosantoniodasilva committed May 13, 2012
  3. Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable

    Upgrade sprockets to 2.1.3
    spastorino committed May 13, 2012
  4. Upgrade sprockets to 2.1.3

    guilleiguaran committed May 13, 2012
  5. Merge pull request #6294 from frodsan/docs_backport

    Adding examples and docs [3-2-stable]
    vijaydev committed May 13, 2012
  6. adding examples and docs

    Francesco Rodriguez committed May 13, 2012
Commits on May 12, 2012
  1. Merge pull request #6292 from erichmenge/3-2-stable-docfix

    3 2 stable guides fix
    rafaelfranca committed May 12, 2012
  2. Update 'getting started' guides for new whitelist security implementa…

    …tion. Closes #6286.
    Erich Menge committed May 12, 2012
Commits on May 11, 2012
  1. Merge pull request #6262 from arunagw/ruby_prof_fix

    Ruby prof fix
    spastorino committed May 11, 2012
Commits on May 10, 2012
  1. Return false for exists? with new records - fixes #6199.

    (cherry picked from commit fa21b73)
    pixeltrix committed May 10, 2012
  2. Refactor the handling of default_url_options in integration tests

    This commit improves the handling of default_url_options in integration
    tests by making behave closer to how a real application operates.
    
    Specifically the following issues have been addressed:
    
    * Options specified in routes.rb are used (fixes #546)
    * Options specified in controllers are used
    * Request parameters are recalled correctly
    * Tests can override default_url_options directly
    pixeltrix committed May 10, 2012
  3. Merge pull request #6230 from spectator/active_resource_exceptions

    ActiveResource::TimeoutError is not loaded
    jeremy committed May 10, 2012
  4. Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fi…

    …xtures__arity
    
    Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
    jeremy committed May 10, 2012
Commits on May 9, 2012
  1. Deprecate ::instantiate_fixtures unused parameter

    Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true).
    
    To be changed in master branch.
    alexeymuranov committed May 9, 2012
  2. Merge pull request #6149 from jmbejar/javascript_include_tag_with_not…

    …_duplicates
    
    Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
    spastorino committed May 9, 2012
  3. Merge pull request #6219 from frodsan/fix_build

    Fix build - 3.2
    drogus committed May 9, 2012
  4. Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stable

    Updated activesupport CHANGELOG [for 3-2-stable]
    vijaydev committed May 9, 2012
  5. Add CHANGELOG section for unreleased Rails 3.2.4; document addition o…

    …f #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
    mjtko committed May 9, 2012
  6. Merge pull request #6223 from carlosantoniodasilva/remove-columns-dep…

    …recation-ruby187
    
    Stop showing deprecations for Ruby 1.8.7 with remove_column
    pixeltrix committed May 9, 2012
  7. Stop showing deprecations for Ruby 1.8.7 with remove_column

    String is Enumerable in 1.8.7, which means that passing a String to
    remove_column was generating deprecation warnings during tests.
    carlosantoniodasilva committed May 9, 2012
  8. Merge pull request #6218 from frodsan/fix_docs_32stable

    Fix docs to support 1.8 syntax
    vijaydev committed May 9, 2012
  9. fix attribute_accessors docs to support 1.8 syntax

    Francesco Rodriguez committed May 9, 2012