Commits on Jun 30, 2016
  1. @jeremy
Commits on Jun 6, 2016
  1. @jeremy

    Merge pull request #25283 from javan/actioncable/blade-on-eventmachin…

    …e1-2
    
    Action Cable: Fix CI tests on Sauce Labs
    jeremy committed Jun 6, 2016
Commits on May 31, 2016
  1. @jeremy

    Merge pull request #25170 from maclover7/add-configuration-cable

    [Action Cable] Add `WebSocket` and `logger` configuration options
    jeremy committed May 31, 2016
  2. @jeremy

    Merge pull request #25216 from javan/actioncable/tune-sauce-labs-tests

    Action Cable: Tune Sauce Labs tests
    jeremy committed May 31, 2016
Commits on May 25, 2016
  1. @jeremy

    Merge pull request #25139 from vipulnsward/revert-bundler-version

    Revert back to a compatible bundler version
    jeremy committed May 25, 2016
Commits on May 19, 2016
  1. @jeremy

    Support for unified Integer class in Ruby 2.4+

    Ruby 2.4 unifies Fixnum and Bignum into Integer: https://bugs.ruby-lang.org/issues/12005
    
    * Forward compat with new unified Integer class in Ruby 2.4+.
    * Backward compat with separate Fixnum/Bignum in Ruby 2.2 & 2.3.
    * Drops needless Fixnum distinction in docs, preferring Integer.
    jeremy committed May 17, 2016
Commits on May 16, 2016
  1. @jeremy

    Action Mailer: Declarative exception handling with `rescue_from`.

    Follows the same pattern as controllers and jobs. Exceptions raised in
    delivery jobs (enqueued by `#deliver_later`) are also delegated to the
    mailer's rescue_from handlers, so you can handle the DeserializationError
    raised by delivery jobs:
    
    ```ruby
    class MyMailer < ApplicationMailer
      rescue_from ActiveJob::DeserializationError do
        …
      end
    ```
    
    ActiveSupport::Rescuable polish:
    * Add the `rescue_with_handler` class method so exceptions may be
      handled at the class level without requiring an instance.
    * Rationalize `exception.cause` handling. If no handler matches the
      exception, fall back to the handler that matches its cause.
    * Handle exceptions raised elsewhere. Pass `object: …` to execute
      the `rescue_from` handler (e.g. a method call or a block to
      instance_exec) against a different object. Defaults to `self`.
    jeremy committed May 13, 2016
Commits on May 9, 2016
  1. @jeremy

    Merge pull request #24935 from javan/actioncable-javascript-tests

    WIP: Action Cable JavaScript tests
    jeremy committed May 9, 2016
Commits on May 2, 2016
  1. @jeremy
Commits on Apr 29, 2016
  1. @jeremy

    AS::Duration changelog polish

    Use the updated changelog from the first merge: 7254517
    
    References #22806, #24762.
    
    [ci skip]
    jeremy committed Apr 29, 2016
Commits on Apr 27, 2016
  1. @jeremy

    Revert "Change 1.week to create 1 week durations instead of 7 days du…

    …rations."
    
    Regression: adding minutes/hours to a time would change its time zone
    
    This reverts commit 1bf9fe7.
    jeremy committed Apr 27, 2016
Commits on Apr 26, 2016
  1. @jeremy

    Merge pull request #24723 from lvl0nax/array_split_fix

    Little perfomance fix for Array#split.
    jeremy committed Apr 26, 2016
  2. @jeremy

    Merge pull request #24641 from rafaelfranca/fix-per-form-token-with-f…

    …ull-url
    
    Discart the schema and host information when building the per-form token
    jeremy committed Apr 25, 2016
  3. @jeremy
Commits on Apr 24, 2016
  1. @jeremy

    Merge pull request #23103 from rails/refactor-handling-of-action-default

    Refactor handling of :action default in routing
    jeremy committed Apr 24, 2016
  2. @jeremy

    Share lock: more accurate livelock fix for aa598f4

    Awaken waiting threads even if the current thread (the previously
    exclusive thread) hadn't taken a share lock.
    
    This only happens in code that wasn't run within an executor, since that
    always take an outermost share lock.
    jeremy committed Apr 24, 2016
  3. @jeremy

    Merge pull request #24709 from y-yagi/add_channels_files_in_stats_task

    add channels files in `stats` task
    jeremy committed Apr 23, 2016
  4. @jeremy

    Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_…

    …adapter
    
    Add prepared statements support for `Mysql2Adapter`
    jeremy committed Apr 23, 2016
  5. @jeremy

    Merge pull request #24708 from kamipo/move_select_rows_implementation…

    …_to_super_class
    
    Move `select_rows` implementation to super class
    jeremy committed Apr 23, 2016
Commits on Apr 23, 2016
  1. @jeremy
  2. @jeremy

    Schema load: Fix dupe version insert

    jeremy committed Apr 22, 2016
Commits on Apr 22, 2016
  1. @jeremy

    Merge pull request #24685 from vipulnsward/sqlite-compat-for-multi-in…

    …sert
    
    Gracefully fallback on version migrations for sqlite < 3.7.11
    jeremy committed Apr 22, 2016
Commits on Apr 21, 2016
  1. @jeremy

    Merge pull request #24676 from vipulnsward/log-ac-failed-states

    Log if redis connection is in stale/failed state.
    jeremy committed Apr 21, 2016
  2. @jeremy

    Merge pull request #24663 from kamipo/remove_unused_blank_re

    Remove unused `BLANK_RE`
    jeremy committed Apr 20, 2016
Commits on Apr 20, 2016
  1. @jeremy

    Merge pull request #23557 from kamipo/dump_indexes_in_create_for_gene…

    …rates_sql_in_one_query
    
    Dump indexes in `create_table` for generates SQL in one query
    jeremy committed Apr 20, 2016
  2. @jeremy

    Merge pull request #20625 from Envek/add_country_zones_method

    Add ActiveSupport::TimeZone.country_zones helper
    jeremy committed Apr 19, 2016
  3. @jeremy

    Ensure Cache#inspect doesn't block concurrent cache writes

    Object#inspect recursively inspects instance variables, exposing all
    internal state, including sensitive internal cache objects. Override
    Cache#inspect to give a high-level summary that never interferes with
    concurrent cache writes.
    jeremy committed Apr 19, 2016
Commits on Apr 19, 2016
  1. @jeremy

    Merge pull request #24031 from samphilipd/sam/do_not_clobber_options_…

    …in_route_definitions
    
    Do not destructively mutate passed options hash in route definitions
    jeremy committed Apr 19, 2016
  2. @jeremy
  3. @jeremy

    Merge pull request #24621 from kamipo/remove_unused_table_with_autoin…

    …crement
    
    Remove unused `table_with_autoincrement` table
    jeremy committed Apr 19, 2016
  4. @jeremy

    Merge pull request #24317 from Gaurav2728/unused_set_in_active_record

    connection adapters column, delegation in Active Record have not use …
    jeremy committed Apr 19, 2016
  5. @jeremy

    Merge pull request #24503 from prathamesh-sonpatki/add-test-for-warn-…

    …on-records-fetched-greater-than
    
    Add missing test case for record_fetched_greater_than config
    jeremy committed Apr 19, 2016
  6. @jeremy

    Merge pull request #24576 from yahonda/quote_column_name_for_reserved…

    …_word_size
    
    Address ORA-00923 error by quoting a reserved word "SIZE"
    jeremy committed Apr 19, 2016
  7. @jeremy
  8. @jeremy