Permalink
Commits on Aug 21, 2016
Commits on Aug 20, 2016
  1. Merge pull request #26227 from alexcameron89/syntax_highlighter_fix

    Increase margin-bottom for doc's code syntax highlighter
    vijaydev committed on GitHub Aug 20, 2016
  2. Increase margin-bottom for doc's code syntax highlighter

    Fixes #25744 by slightly increasing the margin in code syntax
    highlights. With a margin of 0, it was cutting off underscores in Linux
    browesers, so I slightly increased it to 0.5px.
    alexcameron89 committed Aug 19, 2016
  3. Merge pull request #26232 from kamipo/fix_oid_bit_cast_value

    Fix `OID::Bit#cast_value`
    sgrif committed on GitHub Aug 20, 2016
  4. Merge pull request #26233 from y-yagi/update_retry_on_example

    correct exception class in `retry_on` example [ci skip]
    prathamesh-sonpatki committed on GitHub Aug 20, 2016
  5. correct exception class in `retry_on` example [ci skip]

    If the deadlock has occurred `ActiveRecord::Deadlocked` will raise.
    Ref: #25107, #26059
    y-yagi committed Aug 20, 2016
Commits on Aug 19, 2016
  1. Fix `OID::Bit#cast_value`

    Fixes #26137.
    kamipo committed Aug 19, 2016
  2. Merge pull request #26224 from jonatack/consistent-asset-precompile-e…

    …xamples
    
    Consistent examples and template for assets#precompile
    eileencodes committed on GitHub Aug 19, 2016
  3. Consistent examples and template for assets#precompile

    Listening to a few developers today discussing their troubles in understanding how to use the asset pipeline, it turns out that the precompile examples in the guides and assets.rb template have over time become a bit inconsistent.
    
    This PR makes the examples consistent in code style, spacing, and asset names, removes the old 'swfObject.js' example, and in a couple of places wraps lines at 80 characters including in the assets.rb template.
    
    Re-add spaces inside array parentheses.
    jonatack committed Aug 19, 2016
  4. When referring to Rails, be consistent in usage of capitalized form, …

    …unless it is used in context of a command like bin/rails or the rails directory [ci skip]
    vipulnsward committed Aug 19, 2016
  5. Grammar changes on getting started guide, specify where exactly the e…

    …xample is that we are referring to. [ci skip]
    vipulnsward committed Aug 19, 2016
  6. Merge pull request #26219 from kamipo/remove_unused_blob_or_text_column

    Remove unused `blob_or_text_column?` method
    rafaelfranca committed on GitHub Aug 19, 2016
  7. Merge pull request #26218 from kamipo/remove_unnecessary_length

    Remove unnecessary `length` method for collection proxy
    rafaelfranca committed on GitHub Aug 19, 2016
  8. Merge pull request #26212 from evmunro/as-json-sets-request-to-json-f…

    …or-controller-test
    
    Allow setting of request CONTENT-TYPE with as: in controller tests
    rafaelfranca committed on GitHub Aug 19, 2016
  9. Merge pull request #25675 from TimPetricola/schema-no-standardized-co…

    …lumn-widths
    
    Option not to line up column attributes in schema.rb
    rafaelfranca committed Aug 19, 2016
  10. Remove unnecessary `length` method for collection proxy

    `length` is delegated to `records` (`load_target`) by
    `ActiveRecord::Delegation`.
    
    https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/relation/delegation.rb#L38
    kamipo committed Aug 19, 2016
  11. Add chengelog entry to #25976

    [Rafael Mendonça França + Robin Dupret]
    rafaelfranca committed Aug 19, 2016
  12. Merge pull request #26154 from kamipo/remove_text_default_treated_as_…

    …empty_string
    
    Remove text default treated as an empty string in non-strict mode
    rafaelfranca committed Aug 19, 2016
  13. Merge pull request #26217 from kamipo/revert_23067

    Revert "`sql_for_insert` returns values for passing to `exec_insert`"
    rafaelfranca committed on GitHub Aug 19, 2016
  14. Merge pull request #25989 from kamipo/remove_unnecessary_select_for_c…

    …ollection_proxy
    
    Remove unnecessary `select` method for `CollectionProxy`
    rafaelfranca committed on GitHub Aug 19, 2016
  15. Merge pull request #26216 from y-yagi/fixes_19880

    run `before_configuration` callbacks as soon as application constant inherits from Rails::Application
    rafaelfranca committed on GitHub Aug 19, 2016
  16. Revert "`sql_for_insert` returns values for passing to `exec_insert`"

    This reverts #23067. #23067 is for propagating `pk` value from
    `sql_for_insert` to `exec_insert` (avoiding extra query for pg adapter).
    Now `exec_insert` includes `sql_for_insert` since #26002 therefore this
    propagating is no longer needed.
    kamipo committed Aug 19, 2016
  17. Merge pull request #26089 from travisoneill/sqlite_rollback_fix

    Sqlite3 Migration Error Fixed (issue #26087)
    rafaelfranca committed Aug 19, 2016
  18. run `before_configuration` callbacks as soon as application constant …

    …inherits from Rails::Application
    
    Until Rails 4.1, `before_configuration` run as soon as the application constant
    inherits from `Rails::Application`.
    However, in d25fe31, it has been modified to
    run at instantiation process.
    
    This modify to `before_configuration` is run at same timing as to Rails 4.1.
    
    Fixes #19880
    y-yagi committed Jul 25, 2016
  19. Remove text default treated as an empty string in non-strict mode

    Strict mode controls how MySQL handles invalid or missing values in
    data-change statements such as INSERT or UPDATE. If strict mode is not
    in effect, MySQL inserts adjusted values for invalid or missing values
    and produces warnings.
    
    ```ruby
      def test_mysql_not_null_defaults_non_strict
        using_strict(false) do
          with_mysql_not_null_table do |klass|
            record = klass.new
            assert_nil record.non_null_integer
            assert_nil record.non_null_string
            assert_nil record.non_null_text
            assert_nil record.non_null_blob
    
            record.save!
            record.reload
    
            assert_equal 0,  record.non_null_integer
            assert_equal "", record.non_null_string
            assert_equal "", record.non_null_text
            assert_equal "", record.non_null_blob
          end
        end
      end
    ```
    
    It is inconsistent with other types that only text/blob defaults treated
    as an empty string. This commit fixes the inconsistency.
    kamipo committed Aug 13, 2016
  20. Merge pull request #24099 from k0kubun/preserve-readonly

    Preserve readonly flag only for readonly association
    rafaelfranca committed Aug 19, 2016
  21. Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methods

    Remove unnecessary ordinal methods for collection association
    rafaelfranca committed on GitHub Aug 19, 2016
  22. Merge pull request #25999 from kamipo/remove_sanitize_conditions

    Remove `sanitize_conditions` and use `sanitize_sql` instead of `sanitize_conditions`
    rafaelfranca committed on GitHub Aug 19, 2016
  23. Merge pull request #26197 from kamipo/remove_unnecessary_test_sql_for…

    …_insert_with_returning_disabled
    
    Remove unnecessary `test_sql_for_insert_with_returning_disabled`
    rafaelfranca committed on GitHub Aug 19, 2016
Commits on Aug 18, 2016
  1. Merge pull request #26214 from philnash/active-job-default-queue

    Updates Active Job guide on default runner.
    claudiob committed on GitHub Aug 18, 2016
  2. Set the request type if as: is specified

    Documentation & testing
    Everest Munro-Zeisberger committed Aug 18, 2016
  3. [ci skip] Updates ActiveJob guide on default runner.

    The immediate runner is no longer default, the async adapter is.
    philnash committed Aug 18, 2016