Skip to content
Commits on Feb 9, 2016
  1. @vipulnsward

    Merge pull request #23571 from y-yagi/remove_deprecated_render_nothin…

    vipulnsward committed
    …g_from_guide
    
    remove description of `render :nothing` from guide [ci skip]
  2. @y-yagi

    remove description of `render :nothing` from guide [ci skip]

    y-yagi committed
    `:nothing` option was deprecated in 44781b6
  3. @maclover7

    Merge pull request #23567 from kamipo/fix_typo

    maclover7 committed
    Fix typo [ci skip]
  4. @kamipo

    Fix typo [ci skip]

    kamipo committed
Commits on Feb 8, 2016
  1. @tenderlove

    drop array allocations on `html_safe`

    tenderlove committed
    For better or worse, anonymous `*` args will allocate arrays.  Ideally,
    the interpreter would optimize away this allocation.  However, given the
    number of times we call `html_safe` it seems worth the shedding idealism
    and going for performance.  This line was the top allocation spot for a
    scaffold (and presumably worse on real applications).
  2. @tenderlove

    speed up string xor operation and reduce object allocations

    tenderlove committed
    ```
    [aaron@TC rails (master)]$ cat xor.rb
    a = "\x14b\"\xB4P8\x05\x8D\xC74\xC3\xEC}\xFDf\x8E!h\xCF^\xBF\xA5%\xC6\xF0\xA9\xF9x\x04\xFA\xF1\x82"
    b = "O.\xF7\x01\xA9D\xA3\xE1D\x7FU\x85\xFC\x8Ak\e\x04\x8A\x97\x91\xD01\x02\xA4G\x1EIf:Y\x0F@"
    
    def xor_byte_strings(s1, s2)
      s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*')
    end
    
    def xor_byte_strings2(s1, s2)
      s2_bytes = s2.bytes
      s1.bytes.map.with_index { |c1, i| c1 ^ s2_bytes[i] }.pack('c*')
    end
    
    require 'benchmark/ips'
    require 'allocation_tracer'
    
    Benchmark.ips do |x|
      x.report 'xor_byte_strings' do
        xor_byte_strings a, b
      end
    
      x.report 'xor_byte_strings2' do
        xor_byte_strings2 a, b
      end
    end
    
    ObjectSpace::AllocationTracer.setup(%i{type})
    result = ObjectSpace::AllocationTracer.trace do
      xor_byte_strings a, b
    end
    p :xor_byte_strings => result
    ObjectSpace::AllocationTracer.clear
    result = ObjectSpace::AllocationTracer.trace do
      xor_byte_strings2 a, b
    end
    p :xor_byte_strings2 => result
    [aaron@TC rails (master)]$ ruby -I~/git/allocation_tracer/lib xor.rb
    Calculating -------------------------------------
        xor_byte_strings    10.087k i/100ms
       xor_byte_strings2    11.339k i/100ms
    -------------------------------------------------
        xor_byte_strings    108.386k (± 5.8%) i/s -    544.698k
       xor_byte_strings2    122.239k (± 3.0%) i/s -    612.306k
    {:xor_byte_strings=>{[:T_ARRAY]=>[38, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}}
    {:xor_byte_strings2=>{[:T_ARRAY]=>[3, 0, 0, 0, 0, 0], [:T_DATA]=>[1, 0, 0, 0, 0, 0], [:T_IMEMO]=>[2, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}}
    ```
  3. @maclover7

    Merge pull request #23565 from abhishekjain16/fix_grammar

    maclover7 committed
    [ci skip] Fix grammar
  4. @abhishekjain16

    [ci skip] Fix grammar

    abhishekjain16 committed
  5. @arthurnn

    Merge pull request #23534 from bronson/fix-redefined-warning

    arthurnn committed
    fix 'method redefined' warnings
  6. @maclover7

    Merge pull request #23563 from pra85/patch-2

    maclover7 committed
    Fix a typo
  7. @pra85

    Fix a typo

    pra85 committed
    Replace `a` with `an`
  8. @rafaelfranca

    Revert "Merge pull request #23562 from Azzurrio/patch-1"

    rafaelfranca committed
    This reverts commit 8c3cca5, reversing
    changes made to 9dcf67c.
    
    Reason: #23562 (comment)
  9. @kaspth

    Merge pull request #23562 from Azzurrio/patch-1

    kaspth committed
    Update rails-html-sanitizer version to  v1.0.3
  10. @Azzurrio
  11. @prathamesh-sonpatki

    Merge pull request #23560 from prathamesh-sonpatki/rm-rails-4-from-as…

    prathamesh-sonpatki committed
    …sets-guide
    
    Remove references to Rails 4 from assets guide [ci skip]
  12. @kaspth

    Merge pull request #23552 from bronson/revert-dev-cache

    kaspth committed
    revert dev:cache to rake task, fixes #23410
  13. @vipulnsward

    Merge pull request #23558 from kamipo/add_numeric_type_in_doc

    vipulnsward committed
    Add numeric type in the doc [ci skip]
  14. @kamipo

    Add numeric type in the doc [ci skip]

    kamipo committed
    Follow up to #23508.
  15. @prathamesh-sonpatki
  16. @prathamesh-sonpatki

    Merge pull request #23556 from y-yagi/remove_faye-websocket_from_readme

    prathamesh-sonpatki committed
    remove `faye-websocket` dependency from README [ci skip]
  17. @y-yagi

    remove `faye-websocket` dependency from README [ci skip]

    y-yagi committed
    `faye-websocket` gem is no longer used from 322dca2.
  18. @maclover7

    Merge pull request #23554 from romaimperator/update_action_cable_conf…

    maclover7 committed
    …ig_example
    
    config examples for ActionCable now use Rails.application.config.action_cable
  19. @schneems

    Merge pull request #23559 from mabras/patch-1

    schneems committed
    update turbolinks url [ci skip]
  20. @mabras

    update turbolinks url [ci skip]

    mabras committed
Commits on Feb 7, 2016
  1. @sgrif

    Merge pull request #23547 from kamipo/schema_type_returns_symbol

    sgrif committed
    `schema_type` returns symbol rather than string
  2. @romaimperator

    config examples for ActionCable now use Rails.application.config.acti…

    romaimperator committed
    …on_cable
    
    Some existing examples used ActionCable.server.config but for
    configuring allowed_request_origins that is overridden in development
    mode. The correct place to set that is
    Rails.application.config.action_cable which the ActionCable initializer
    loads from. I thought the other two examples should be changed as well
    just in case a default value that would override a configured value is
    introduced for either log_tags or disable_request_forgery_protection in
    the future.
  3. @bronson
  4. @sgrif

    Merge pull request #23508 from meinac/add_numeric_type_into_migrations

    sgrif committed
    Added numeric helper into `SchemaStatements` for MySQL and PostgreSQL
  5. @maclover7

    Merge pull request #23531 from coldnebo/docfix

    maclover7 committed
    doc changes to clarify asset pipeline
  6. @coldnebo

    doc changes

    coldnebo committed
    for rails/rails#23431
    
           modified:   guides/source/asset_pipeline.md
    * description of asset combination from apps and gems, e.g. jquery-rails
    * after @vipulnsward's related change rails/rails#23479
      correction: --skip-sprockets will prevent all of these gems, not just sass-rails and uglifier
    
           modified:   guides/source/working_with_javascript_in_rails.md
    * noted that rails.js requires the asset pipeline
    
    [ci skip]
  7. @matthewd

    Merge pull request #23532 from matthewd/live-interlock

    matthewd committed
    Hand off the interlock to the new thread in AC::Live
  8. @kamipo

    `schema_type` returns symbol rather than string

    kamipo committed
    A return value of `schema_type` is used by:
    
    1. primary key type: using as `symbol.inspect`
    2. normal column type: using as `symbol.to_s`
    
    It is better to return symbol.
  9. @matthewd
  10. @matthewd
  11. @thedarkone
Something went wrong with that request. Please try again.