Commits on Jun 11, 2016
  1. @vipulnsward

    Merge pull request #25363 from kamipo/fix_or_result_sql

    Fix `or` result SQL [ci skip]
    vipulnsward committed on GitHub Jun 11, 2016
  2. @kamipo

    Fix `or` result SQL [ci skip]

    kamipo committed Jun 11, 2016
  3. @sgrif

    Merge pull request #25361 from maclover7/jm-rm-stuff

    Remove `_run_class_setup`
    sgrif committed on GitHub Jun 10, 2016
  4. @maclover7

    Remove `_run_class_setup`

    Should have been removed by 3073c53.
    maclover7 committed Jun 10, 2016
Commits on Jun 10, 2016
  1. @rafaelfranca

    Merge pull request #25321 from prathamesh-sonpatki/update-release-not…

    …es-1
    
    Add missing things to release notes [ci skip]
    rafaelfranca committed on GitHub Jun 10, 2016
  2. @rafaelfranca
  3. @rafaelfranca

    Merge pull request #25351 from kmcphillips/asset-default-config-quiet

    Add config.assets.quiet = true as default for generator
    rafaelfranca committed on GitHub Jun 10, 2016
  4. @rafaelfranca

    Merge pull request #25341 from kmcphillips/master

    Broadcast #silence on ActiveSupport::Logger
    rafaelfranca committed on GitHub Jun 10, 2016
  5. @rafaelfranca

    Merge pull request #25352 from Shopify/optimized-delegate

    Replace Kernel#caller by the faster Kernel#caller_locations
    rafaelfranca committed on GitHub Jun 10, 2016
  6. @vipulnsward

    Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-name

    [ci skip] `define_model_callbacks` only exist in active model
    vipulnsward committed on GitHub Jun 10, 2016
  7. @byroot
  8. @Edouard-chin

    [ci skip] `define_model_callbacks` only exist in active model:

    - Also added a note when calling multiple time `define_callbacks`
    Edouard-chin committed Jun 9, 2016
  9. @kmcphillips
  10. @maclover7

    Merge pull request #25348 from alexcameron89/master

    Fix typo in ActionController::Renderer [ci skip]
    maclover7 committed on GitHub Jun 10, 2016
  11. @alexcameron89
  12. @kmcphillips
  13. @kmcphillips
Commits on Jun 9, 2016
  1. @maclover7

    Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047

    Fix Typo in `SuckerPunchAdapter`
    maclover7 committed Jun 9, 2016
  2. @jwworth
  3. @sgrif

    Remove dead code from tests

    This code was added in 81286f8, but was
    not used by that commit and does not appear to have ever been used.
    sgrif committed Jun 9, 2016
  4. @bmedenwald @sgrif

    render_to_string Regression Outside of Real Requests in Rails 5.0.0.r…

    …c1 (#25308)
    
    * Restore the functionality of PR#14129, but do so with not nil to better indicate the purpose of the conditional
    
    * Add a test when render_to_string called on ActionController::Base.new()
    bmedenwald committed with sgrif Jun 9, 2016
  5. @sgrif

    Merge pull request #25329 from yahonda/allow_oracle_bind_value_syntax…

    …_in_loj_test
    
    Allow Oracle bind parameter syntax `:a1` in test_join_conditions_added_to_join_clause
    sgrif committed Jun 9, 2016
  6. @sgrif

    Merge pull request #25334 from abhishekjain16/doc_fix

    Fix typo
    sgrif committed Jun 9, 2016
  7. @vipulnsward

    Merge pull request #25335 from y-yagi/remove_deprecated_prefix_option

    remove deprecated `:prefix` option  from doc [ci skip]
    vipulnsward committed Jun 8, 2016
  8. @y-yagi

    remove deprecated `:prefix` option from doc [ci skip]

    The option was deprecated in #21191.
    y-yagi committed Jun 9, 2016
  9. @abhishekjain16

    Fix typo

    abhishekjain16 committed Jun 9, 2016
  10. @rafaelfranca

    Merge pull request #25332 from abhishekjain16/test_fix

    existant => existent
    rafaelfranca committed Jun 9, 2016
  11. @abhishekjain16

    existant => existent

    abhishekjain16 committed Jun 9, 2016
Commits on Jun 8, 2016
  1. @schneems

    Merge pull request #25315 from schneems/schneems/inclusion-doc

    [ci skip] Expand information on message options
    schneems committed Jun 8, 2016
  2. @yahonda
  3. @schneems

    [ci skip] Expand information on message options

    Link to the more detailed message documentation when using a message option in validations.
    schneems committed Jun 7, 2016
  4. @fxn

    Merge pull request #25327 from prathamesh-sonpatki/add-5-0-notes-to-t…

    …he-index
    
    Add Rails 5.0 release notes to the index page of guides [ci skip]
    fxn committed Jun 8, 2016
  5. @prathamesh-sonpatki

    Add Rails 5.0 release notes to the index page of guides [ci skip]

    - It is also marked as WIP as we are still refining it.
    prathamesh-sonpatki committed Jun 8, 2016
  6. @dhh

    Merge pull request #25323 from vipulnsward/ac-release-notes

    Add Action Cable introduction to release notes
    dhh committed Jun 8, 2016
  7. @sgrif

    Merge pull request #25281 from maclover7/jm-add-internal

    `{ internal: true }` from being stored in the router
    sgrif committed Jun 7, 2016