Permalink
Commits on Sep 5, 2012
  1. Merge pull request #7530 from robin850/master

    Fix a typo in AD
    fxn committed Sep 5, 2012
  2. Fix a typo

    robin850 committed Sep 5, 2012
  3. Merge pull request #7519 from leocassarani/merge-with-block

    Add an optional block to HashWithIndifferentAccess#update and #merge
    rafaelfranca committed Sep 5, 2012
Commits on Sep 4, 2012
  1. Extend HashWithIndifferentAccess#update to take an optional block

    When a block is passed into the method, it will be invoked for each
    duplicated key, with the key in question and the two values as
    arguments. The value for the duplicated key in the receiver will
    be set to the return value of the block.
    
    This behaviour matches Ruby's long-standing implementation of
    Hash#update and is intended to provide a more consistent interface.
    
    HashWithIndifferentAccess#merge is also affected by the change, as it
    uses #update internally.
    leocassarani committed Sep 3, 2012
  2. Merge pull request #7522 from lexmag/mime_type

    Refactor `Mime::Type`
    rafaelfranca committed Sep 4, 2012
  3. Refactor `Mime::Type`

    `parse` method performance improvements - ~27-33%:
    
        accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword,  , pronto/1.00.00, sslvpn/1.00.00.00, */*"
    
        Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }}
    
        old: 1.430000   0.000000   1.430000 (  1.440977)
        new: 0.920000   0.000000   0.920000 (  0.921813)
    lexmag committed Sep 2, 2012
  4. We dont need to include the name and the format in the digest -- sour…

    …ce is authoritative enough
    dhh committed Sep 4, 2012
  5. Merge pull request #7422 from ernie/improvements-to-improved-routing

    Allow routing concerns to accept a callable
    dhh committed Sep 4, 2012
Commits on Sep 3, 2012
  1. revised the exception message "Expected #{file_path} to define #{qual…

    …ified_name}"
    
    Users need to know the ultimate problem here is that AS was
    trying to autoload a constant and it failed.
    fxn committed Sep 3, 2012
  2. Merge pull request #7515 from senny/custom_inheritance_column_test_re…

    …factoring
    
    custom inheritance_column test refactoring
    rafaelfranca committed Sep 3, 2012
  3. test cleanup, remove ruby_type because it's no longer needed

    All tests with a custom inheritance_column use the `Vegtable` model.
    The field ruby_type on the Company models is no longer needed
    senny committed Sep 3, 2012
  4. rewrite inheritance tests with a custom inheritance_column

    previously the tests with and without a custom `inheritance_column`
    used the same models. Since the model then has both fields this can lead
    to false positives.
    senny committed Sep 3, 2012
  5. Fix concerns not executing block in mapper

    Also, add documentation for alternate usage.
    ernie committed Aug 23, 2012
  6. Allow routing concerns to accept a callable

    This allows us to make alterations to the generated routes based on the
    scope of the current mapper, and otherwise allows us to move larger
    blocks of concerns out of the routes file, altogether.
    ernie committed Aug 22, 2012
  7. Merge pull request #7506 from senny/issue_7503

    #becomes works with configured inheritance_column
    rafaelfranca committed Sep 3, 2012
  8. set the configured #inheritance_column on #become (#7503)

    I had to create a new table because I needed an STI table,
    which does not have both a "type" and a "custom_type"
    
    the test fails with:
      1) Error:
    test_alt_becomes_works_with_sti(InheritanceTest):
    NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
        /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb💯in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
        test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
        test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
    senny committed with senny Sep 2, 2012
Commits on Sep 2, 2012
  1. Merge pull request #7502 from xoen/fixed-upgrading-guide-markup

    Fixed markup in Upgrading RoR guide [ci skip]
    carlosantoniodasilva committed Sep 2, 2012
  2. Merge pull request #7504 from behrends/patch-1

    Fix example code: use tasks instead of comments [ci skip]
    carlosantoniodasilva committed Sep 2, 2012
  3. Fixed markup in Upgrading RoR guide [ci skip]

    There are two changes:
    - Using <ruby> syntax for unicode character routes example instead of
      <tt> since it causes single quotes to be transformed into inverted
      commas. This makes this required change more eye-catching.
    - Using <tt> for the j alias and related helpers as written in the
      documentation guidelines.
    xoen committed Sep 2, 2012
  4. Merge pull request #7495 from steveklabnik/issue_7478

    Properly reset the session on reset_session
    tenderlove committed Sep 2, 2012
Commits on Sep 1, 2012
  1. Force reloading of the session after destroy

    Use load_for_write! to ensure a refresh of the session object.
    This way the new session_id and the empty data will be stored properly.
    E.g. in the case of the session cookie store this means that a new
    digest will be returned to the user.
    alup committed with steveklabnik Sep 1, 2012
  2. copy edits [ci skip]

    vijaydev committed Sep 1, 2012
  3. require bundle in the app generator

    The app generator is not generally run under bundler, but the Bundler
    constant is used here.
    
    In particular you cannot create --dev apps without this.
    fxn committed Sep 1, 2012
  4. Revert "added .DS_Store to .gitignore"

    This reverts commit fc80ebb.
    
    Such changes aren't allowed in docrails.
    vijaydev committed Sep 1, 2012
  5. Remove unneeded require

    drogus committed Sep 1, 2012
  6. Merge pull request #7494 from route/actionview_decoupling_issue

    ActionView decoupling and sprockets-rails tests fail
    drogus committed Sep 1, 2012
  7. Sprockets-rails tests fail

    Method invalid_asset_host! was delegated to controller but sprockets
    compile assets in their own scope without controller. And if we set asset_host
    with second parameter it should raise error through invalid_asset_host!.
    But since controller is nil it cannot be reached.
    route committed Sep 1, 2012
Commits on Aug 31, 2012
  1. reverting changes from commit b0896c3

    5v3n committed Aug 31, 2012
  2. Require bundler 1.2

    drogus committed Aug 31, 2012