Permalink
Commits on May 11, 2012
  1. Remove #=== quirk

    Makes it consistent with Relation. Can't see a use for this.
    jonleighton committed May 11, 2012
  2. Lazy load I18n

    spastorino committed May 10, 2012
  3. Remove ruby/shim

    require 'action_view' is now much faster
    spastorino committed May 10, 2012
  4. extract deprecated code

    jonleighton committed May 11, 2012
  5. CollectionProxy < Relation

    This helps bring the interfaces of CollectionProxy and Relation closer
    together, and reduces the delegation backflips we need to perform.
    
    For example, first_or_create is defined thus:
    
    class ActiveRecord::Relation
      def first_or_create(...)
        first || create(...)
      end
    end
    
    If CollectionProxy < Relation, then post.comments.first_or_create will
    hit the association's #create method which will actually add the new record
    to the association, just as post.comments.create would.
    
    With the previous delegation, post.comments.first_or_create expands to
    post.comments.scoped.first_or_create, where post.comments.scoped has no
    knowledge of the association.
    jonleighton committed May 11, 2012
  6. Merge pull request #6269 from edtsech/hash-except-test

    Add test Hash#except can receive more than one argument.
    fxn committed May 11, 2012
  7. Merge pull request #6268 from carlesso/master

    In robots.txt User-agent should be all downcase except for the first 'U'
    josevalim committed May 11, 2012
  8. Fixes issue #6251

    Plugin generator crashes when using the --dummy-path option
    
    Code was assuming the application name in `config/application.rb`
    was module Dummy.
    dabit committed with drogus May 10, 2012
  9. Failing test for #6251

    drogus committed May 10, 2012
Commits on May 10, 2012
  1. 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
  2. Merge pull request #6253 from rafmagana/master

    remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action
    josevalim committed May 10, 2012
  3. Merge pull request #6252 from grosser/unless_exist_for_memory_store

    add unless_exist option to memory store
    josevalim committed May 10, 2012
  4. Merge pull request #6244 from frodsan/fix_build_remove_key

    Remove key argument from run_callbacks to fix build
    josevalim committed May 10, 2012
  5. Remove key argument from run_callbacks to fix build

    Francesco Rodriguez committed May 10, 2012
  6. Merge pull request #6242 from frodsan/fix_abstract_controller

    Removing key argument from run_callbacks method in abstract_controller
    josevalim committed May 10, 2012
  7. removing key argument from run_callbacks - fix build

    Francesco Rodriguez committed May 10, 2012
  8. Merge pull request #6241 from frodsan/deprecate_key_callbacks

    AS::Callbacks#run_callbacks remove key argument
    josevalim committed May 10, 2012
  9. AS::Callbacks#run_callbacks remove key argument

    Francesco Rodriguez committed May 10, 2012
  10. Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb

    Rename variables and remove unused code in fixtures.rb
    jeremy committed May 10, 2012
Commits on May 9, 2012
  1. Merge pull request #5362 from zenprogrammer/quoting_bug

    Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
    tenderlove committed May 9, 2012