Permalink
Switch branches/tags
Commits on Nov 20, 2018
  1. Merge pull request #34497 from 6temes/make_documentation_for_slice_mo…

    rafaelfranca committed Nov 20, 2018
    …re_explicit
    
    Expand documentation for Hash#slice!
  2. Improve documentation for Hash#slice!

    6temes committed Nov 20, 2018
  3. Merge pull request #34495 from rails/make-connection-handler-per-thre…

    eileencodes committed Nov 20, 2018
    …ad-not-per-fiber
    
    Make connection handler per thread instead of per fiber
  4. Make connection handler per thread instead of per fiber

    eileencodes committed Nov 20, 2018
    The connection handler was using the RuntimeRegistry which kind of
    implies it's a per thread registry. But it's actually per fiber.
    
    If you have an application that uses fibers and you're using multiple
    databases, when you switch the connection handler to swap connections
    new fibers running on the same thread used to get a different connection
    id. This PR changes the code to actually use a thread so that we get
    the same connection.
    
    Fixes #30047
    
    [Eileen M. Uchitelle, Aaron Patterson, & Arthur Neeves]
  5. Merge pull request #34494 from gmcgibbon/warn_root_conflict

    rafaelfranca committed Nov 20, 2018
    Stop using unnamed roots on conflict
  6. Raise an error on root route naming conflicts.

    gmcgibbon committed Nov 20, 2018
    Raises an ArgumentError when multiple root routes are defined in the
    same context instead of assigning nil names to subsequent roots.
  7. Merge pull request #33954 from febeling/inconsistent-assignment-has-m…

    tenderlove committed Nov 20, 2018
    …any-through-33942
    
    Fix handling of duplicates for `replace` on has_many-through
  8. Merge pull request #34492 from alfonsojimenez/fix-typo

    vipulnsward committed Nov 20, 2018
    Fix typo in development_dependencies_install.md [ci skip]
  9. Deprecate `event.end = Time.now` in favor of `event.finish!`

    kamipo committed Nov 20, 2018
    Since #33449, `event.end = Time.now` is not used anymore and should use
    `event.finish!`.
    
    We can't use `deprecate :end=` in definition time in this module due to
    circular require in `active_support/deprecation/behaviors`.
  10. Merge pull request #22534 from evopark/master

    rafaelfranca committed Nov 20, 2018
    ActionMailer: support overriding template name in multipart
  11. Merge pull request #20865 from colavitam/only-except-behavior

    rafaelfranca committed Nov 20, 2018
    :only and :except are now chained for routing resource(s)
Commits on Nov 19, 2018
  1. Merge pull request #34488 from mullican/word_wrap_preserve_left_side_…

    rafaelfranca committed Nov 19, 2018
    …whitespace
    
    Prevent TextHelper#word_wrap from stripping white space on the left side of long lines; Fixes #34487
  2. Merge pull request #34085 from albertoalmagro/display-help-as-command…

    rafaelfranca committed Nov 19, 2018
    …-line-guides
    
    Homogenize also rails help command output
  3. Merge pull request #34106 from berniechiu/rails-5-job-serializable-pa…

    rafaelfranca committed Nov 19, 2018
    …rams-class
    
    Permit of ActionController::Parameters for ActiveJob Serializable Argument
  4. Permit ActionController::Parameters for serializable Hash

    Bernie Chiu authored and rafaelfranca committed Oct 5, 2018
  5. Merge pull request #34482 from jacobherrington/chore/add-comments-to-…

    rafaelfranca committed Nov 19, 2018
    …templates
    
    Add comments to markdown templates
  6. Prevent TextHelper#word_wrap from stripping white space on the left

    mullican committed Nov 19, 2018
    side of long lines; Fixes #34487
  7. Homogenize rails help output

    albertoalmagro committed Oct 4, 2018
    In commit 6567464 we homogenized rails
    commands with former rake tasks. We decided to display all commands at
    the same level and merged the list of commands displayed by `rails help`.
    
    We however forgot to actually merge the output in the command itself.
    This commit fixes that.
  8. Indent guides as rails help command output[ci skip]

    albertoalmagro committed Oct 4, 2018
    The output from `rails help` actually leaves an empty space when
    printing the command lists. This commit adapts this guide to have the
    same format.
  9. Merge pull request #34453 from bogdanvlviv/exercise-connected_to-and-…

    tenderlove committed Nov 19, 2018
    …connects_to
    
    Exercise `connected_to` and `connects_to` methods
  10. Merge pull request #34486 from tamarr/master

    rafaelfranca committed Nov 19, 2018
    allow right to left styling of docs
  11. Merge pull request #34410 from gmcgibbon/test_support_windows

    eileencodes committed Nov 19, 2018
    Windows support for parallelization and instrumenter
  12. Merge pull request #34476 from y-yagi/fix_no_method_error_in_parallel…

    eileencodes committed Nov 19, 2018
    …ization
    
    Correctly handle unknown object in parallel tests
  13. allow right to left styling of docs (#3)

    tamarr committed Nov 19, 2018
    * adding rtl css main file and logic to use
  14. Merge pull request #34483 from iguchi1124/patch-1

    kamipo committed Nov 19, 2018
    Update active_job_basics.md
    
    [ci skip]
  15. [ci skip] Update active_job_basics.md

    iguchi1124 committed Nov 19, 2018
    ApplicationJob should be inherits ActiveJob::Base
  16. Merge pull request #34481 from jacobherrington/patch-1

    gmcgibbon committed Nov 19, 2018
    Correct a spelling error
  17. Change queueing to queuing in docs and comments [skip ci]

    jacobherrington committed Nov 19, 2018
    My spellchecker flagged this as an incorrect spelling, upon further
    research it appears to be a point of contention in English. Either way
    might work.
    
    After further examination queuing is much more common in the Rails
    codebase so making this change will serve to standardize the spelling.
Commits on Nov 18, 2018
  1. Add comments to markdown templates

    jacobherrington committed Nov 18, 2018
  2. Fix test name to match the test behavior

    y-yagi committed Nov 18, 2018
    These tests are for testing the `rake` method.
  3. Remove unused `Journey::Router::RoutingError`

    y-yagi committed Nov 18, 2018
    `Journey::Router::RoutingError` is no longer used since db06d12.
Commits on Nov 17, 2018
  1. Merge pull request #34475 from rmacklin/synchronize-actioncable-compi…

    y-yagi committed Nov 17, 2018
    …led-bundle-and-source
    
    Synchronize ActionCable JS source code with compiled bundle
  2. Correctly handle unknown object in parallel tests

    y-yagi committed Nov 16, 2018
    DRb wraps in `DRbUnknown` if the data contains a type that can not be
    resolved locally. This can happen if an error occurs in the test and the
    error class can not be resolved on the server side.
    
    When this happens, an instance of `DRbUnknown` is passed to the `result`
    of `Server#record`. This causes another error(undefined method assertions
    for #<DRb::DRbUnknown:> (NoMethodError)) in `reporter.record`.
    This can confirm by the following steps.
    
    ```
    $ rails new app -B --dev; cd app
    $ rails g scaffold user name:string
    $ edit `config.action_controller.allow_forgery_protection = true` in environments/test.rb
    $ bin/rails t
    ```
    
    In the case of `DRbUnknown` occurs, can't resolve error exception. So wrap
    exception with `DRbRemoteError` in the same way as an unmarshalled object.
  3. Synchronize ActionCable JS source code with compiled bundle

    rmacklin committed Nov 17, 2018
    30a0c7e commited changes to the
    compiled bundle but not to the corresponding source files. This meant
    that running `yarn build` was producing untracked changes to the
    compiled bundle. The fix is to commit the changes to the source files
    so that they are in sync.