Permalink
Switch branches/tags
Commits on Feb 5, 2016
  1. Cant run on an out-of-the-box OSX installation without running out of…

    dhh committed Feb 5, 2016
    … TOO MANY FILES OPEN
  2. Merge pull request #23494 from prathamesh-sonpatki/update-turbolinks

    rafaelfranca committed Feb 5, 2016
    Update turbolinks-rails for passing railties test
  3. Merge pull request #23496 from y-yagi/donot_explicitly_mention_eventm…

    prathamesh-sonpatki committed Feb 5, 2016
    …achine_in_template
    
    don’t explicitly mention EventMachine [ci skip]
  4. don’t explicitly mention EventMachine [ci skip]

    y-yagi committed Feb 5, 2016
    Follow up to 6accef4
  5. Merge pull request #23491 from y-yagi/move_changelog_entry_2

    kaspth committed Feb 5, 2016
    move CHANGELOG entry to the appropriate position [ci skip]
  6. move CHANGELOG entry to the appropriate position [ci skip]

    y-yagi committed Feb 5, 2016
    Dummy apple icon files has been added after the 5.0.0.beta2 release.
    ref: #23455
  7. Merge pull request #23489 from y-yagi/add_missing_include_to_engine_t…

    vipulnsward committed Feb 5, 2016
    …est_example
    
    add missing include to engine test example [ci skip]
  8. add missing include to engine test example [ci skip]

    y-yagi committed Feb 5, 2016
    Using url helper method of engine in example code,
    include `Engine.routes.url_helpers` is required to use helper method of engine.
  9. Merge pull request #23472 from jhubert/patch-2

    rafaelfranca committed Feb 5, 2016
    Remove the assumption of schema in DATABASE_URL
Commits on Feb 4, 2016
  1. Merge pull request #23473 from gsamokovarov/kernel-module-function

    rafaelfranca committed Feb 4, 2016
    Don't publicize Kernel core extensions
  2. Merge pull request #23481 from meinac/activemodel_errors_doc_for_beha…

    sgrif committed Feb 4, 2016
    …viour
    
    Add documentation about `ActiveModel::Errors#[]` method to describe how it works [ci skip]
  3. Merge pull request #23484 from rubys/patch-1

    rafaelfranca committed Feb 4, 2016
    hotlink to the source and results for AWDwR tests
  4. Test with Turbolinks 5

    rafaelfranca committed Feb 4, 2016
  5. Merge pull request #23479 from vipulnsward/23431-remove-jquery-on-spr…

    rafaelfranca committed Feb 4, 2016
    …ockets-skip
    
    Remove jquery-rails gem from generator if --skip-sprockets is true
  6. - app generate option --skip-sprockets leaves jquery-rails gem, which…

    vipulnsward committed Feb 4, 2016
    … relies on sprockets environment
    
    - Remove jquery-rails if --skip-sprockets is true
    
    Fixes #23431
  7. Merge pull request #23480 from sikachu/redis-commented-out

    dhh committed Feb 4, 2016
    Update assertion on redis in generated Gemfile
  8. Update assertion on redis in generated Gemfile

    sikachu committed Feb 4, 2016
    Redis now included in Gemfile but commented out. This change was made in
    9186443 and is causing the test
    failure.
    
    See https://travis-ci.org/rails/rails/jobs/106994913#L1025
  9. Merge pull request #23478 from vipulnsward/23470-pass-api-in-update-g…

    rafaelfranca committed Feb 4, 2016
    …enerator
    
    Pass api only option to rails rails:update task to update only based on api Apps
  10. Turbolinks has moved out

    dhh committed Feb 4, 2016
    All grown up and shit!
  11. Redis is now only needed if you want to use Action Cable in production

    dhh committed Feb 4, 2016
    So no need to have it on by default in the Gemfile.
  12. Don't publicize Kernel core extensions

    gsamokovarov committed Feb 4, 2016
    This is a reaction to a [bug] we hit in web-console. The cause of it was
    a `Kernel` extension called `#console` that was public and was fighting
    over Railties with console block to be run on `rails console`. We solved
    it by making the method private. We did that through `module_function`
    so `::Kernel.console` can be invoked even in `BasicObject`.
    
    I'm proposing to make most of the core Active Support `Kernel`
    extensions `module_function` as well. Those are currently public and we
    are polluting every `Object` public interface with them.
    
    ```ruby
    >> Object.new.respond_to? :silence_warnings
    => true
    
    >> Object.new.respond_to? :with_warnings
    => true
    
    >> Object.new.respond_to? :enable_warnings
    => true
    
    >> Object.new.respond_to? :suppress
    => true
    ``
    
    Some extensions like `Kernel#class_eval` should be public, but most of
    them don't really need to be.
    
    [bug]: rails/web-console#184
  13. Remove the assumption of schema in DATABASE_URL

    jhubert committed Feb 4, 2016
    If you set the DATABASE_URL environment variable to `mydatabase` by accident, you end up getting a series of errors that are hard to trace. For example: 
    
    ```
    warning: already initialized constant ActiveRecord::Base::OrmAdapter
    ```
    
    Turns out the cascade of errors is due to the error raised by `.tr` being called on `nil`.
    
    This commit makes sure that `scheme` is set before calling `.tr` on it. My previous iteration used `@uri.scheme.try(:tr, '-', '_')` but using the `&&` logical operator is a fair bit faster: http://stackoverflow.com/questions/26655032/try-vs-performance
    
    With this change, the error message becomes much more understandable:
    
    ```
    FATAL:  database "mydatabase" does not exist (ActiveRecord::NoDatabaseError)
    ```