Permalink
Commits on Dec 29, 2015
  1. Merge pull request #22824 from maclover7/add-numericwithformat-tests

    Add test coverage for ActiveSupport::NumericWithFormat#to_formatted_s
    senny committed Dec 29, 2015
  2. Merge pull request #22822 from maclover7/fix-22805

    Add a missing require to ActiveSupport::NumericWithFormat
    schneems committed Dec 29, 2015
Commits on Dec 28, 2015
  1. Merge pull request #22053 from Empact/first-loaded

    Fix #first(limit) to take advantage of #loaded? records if available
    senny committed Dec 28, 2015
  2. tests, don't connect to mysql when running sqlite3 tests.

    This resolves the following error:
    
    ```
    Error:
    TestAdapterWithInvalidConnection#test_inspect_on_Model_class_does_not_raise:
    TypeError: superclass mismatch for class Mysql2Adapter
        /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:35:in `<module:ConnectionAdapters>'
        /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:34:in `<module:ActiveRecord>'
        /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:6:in `<top (required)>'
        /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require'
        /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `block in require'
        /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:268:in `load_dependency'
        /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require'
        /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/connection_specification.rb:174:in `spec'
        /Users/senny/Projects/rails/activerecord/lib/active_record/connection_handling.rb:50:in `establish_connection'
        /Users/senny/Projects/rails/activerecord/test/cases/invalid_connection_test.rb:12:in `setup'
    ```
    senny committed Dec 28, 2015
  3. Merge pull request #22809 from prathamesh-sonpatki/fix-broadcast-typo

    Removed extra "the" in the documentation of `broadcast_message` [ci skip]
    matthewd committed Dec 28, 2015
Commits on Dec 27, 2015
  1. [ci skip] Fix typos in Active Support changelog.

    It's numeric and the framework is called Action Controller.
    kaspth committed Dec 27, 2015
  2. Merge pull request #22771 from nwjsmith/document-broadcast-messages

    Document `Logger#broadcast_messages` option
    eileencodes committed Dec 27, 2015
  3. Add CHANGELOG entry for #22759

    CHANGELOG entry for petabyte and exabyte
    eileencodes committed Dec 27, 2015
  4. Merge pull request #22759 from akshay-vishnoi/human-size-helper

    Add support for Petabyte and Exabyte in number to human size
    eileencodes committed Dec 27, 2015
  5. Merge pull request #22801 from y-yagi/fix_link_to_pr

    fix link to pr [ci skip]
    schneems committed Dec 27, 2015
  6. fix link to pr [ci skip]

    y-yagi committed Dec 27, 2015
Commits on Dec 25, 2015
  1. Merge pull request #22791 from habermann24/action_cable_styling

    [ActionCable] remove not needed protected call and newlines
    rafaelfranca committed Dec 25, 2015
  2. Merge pull request #22792 from maclover7/patch-3

    Add Ruby 2.3.0 to Travis matrix
    rafaelfranca committed Dec 25, 2015
  3. Merge pull request #22789 from prathamesh-sonpatki/fix-thor-default-t…

    …ype-error
    
    Changed default value of `:rc` option to `nil`
    senny committed Dec 25, 2015
  4. Changed default value of `:rc` option to `nil`

    - This fixes an error thrown by Thor because type of default value of
      `:rc` option which is `:boolean` does not match with it's default type
      which is `string`.
    - Ref - https://github.com/erikhuda/thor/blob/master/lib/thor/parser/option.rb#L125
    prathamesh-sonpatki committed Dec 25, 2015
  5. Merge pull request #22787 from kamipo/fix_varbinary_with_default_empt…

    …y_string
    
    Fix varbinary with default ''
    sgrif committed Dec 25, 2015
Commits on Dec 24, 2015
  1. Merge pull request #22785 from timrogers/master

    Improve documentation for `config.ssl_options`
    schneems committed Dec 24, 2015
  2. Fix `first(limit)` to take advantage of `loaded?` records if available

    I realized that `first(2)`, etc. was unnecessarily querying for the
    records when they were already preloaded. This was because
    `find_nth_with_limit` can not know which `@records` to return because
    it conflates the `offset` and `index` into a single variable, while
    the `@records` only needs the `index` itself to select the proper
    record.
    
    Because `find_nth` and `find_nth_with_limit` are public methods, I
    instead introduced a private method `find_nth_with_limit_and_offset`
    which is called internally and handles the `loaded?` checking.
    
    Once the `offset` argument is removed from `find_nth`,
    `find_nth_with_limit_and_offset` can be collapsed into
    `find_nth_with_limit`, with `offset` always equal to `offset_index`.
    Empact committed Oct 23, 2015
  3. Deprecate passing `offset` to `find_nth`

    All uses of the `offset` are passing `offset_index`. Better to push
    down the `offset` consideration into `find_nth`.
    
    This also works toward enabling `find_nth_with_limit` to take
    advantage of the `loaded?` state of the relation.
    Empact committed Oct 23, 2015
  4. Merge pull request #22786 from jonatack/remove-whitespace

    ✂️ whitespace in generated config files [skip ci]
    claudiob committed Dec 24, 2015
  5. Fix varbinary with default ''

    A `(?:var)?binary` with default '' is a correct definition.
    Remove `missing_default_forged_as_empty_string?` method for fixing this
    issue because this method is a workaround for older mysql legacy adapter
    (19c99ac, f701533).
    kamipo committed Dec 24, 2015
  6. Merge pull request #22778 from y-yagi/fix_submit_tag_with_symbol_value

    fix TypeError when using submit_tag with Symbol value
    senny committed Dec 24, 2015
  7. Merge pull request #22780 from pauloancheta/master

    Fix typo on documentation
    schneems committed Dec 24, 2015
Commits on Dec 23, 2015
  1. fix typo on comments

    pauloancheta committed Dec 23, 2015
  2. Merge pull request #22750 from nettofarah/patch-1

    Plugin Usage and Installation instructions
    sgrif committed Dec 23, 2015
  3. Move test coloring closer to where it's used.

    Didn't like the constant being at the top of the file, gave it overdue importance.
    
    Now that `color_output` expects a result we can shorten some of the flexibility
    from earlier:
    
      * Inline COLOR_CODES constant (keep local variable for readability,
        but don't need names of colors at run time).
      * Inline color variable in `color_output`. Looks just as clear without it.
    kaspth committed Dec 23, 2015