Skip to content
Commits on May 6, 2016
  1. @vipulnsward

    Merge pull request #24892 from javiervidal/2_3_release_notes

    Fix broken links in 'Ruby on Rails 2.3 Release Notes' [ci skip]
    vipulnsward committed May 6, 2016
  2. @sgrif

    Allow the connection adapters to determine the order of bind params

    In 5.0 we use bind parameters for limit and offset, while in 4.2 we used
    the values directly. The code as it was written assumed that limit and
    offset worked as `LIMIT ? OFFSET ?`. Both Oracle and SQL Server have a
    different syntax, where the offset is stated before the limit. We
    delegate this behavior to the connection adapter so that these adapters
    are able to determine how the bind parameters are flattened based on
    what order their specification has the various clauses appear.
    
    Fixes #24775
    sgrif committed May 6, 2016
  3. @javiervidal
  4. @maclover7

    Merge pull request #24888 from javiervidal/configuring

    Fix link in 'Configuring Rails Applications' [ci skip]
    maclover7 committed May 6, 2016
  5. @javiervidal
  6. @eileencodes

    Merge pull request #24885 from javiervidal/3_0_release_notes

    Fix link in 'Ruby on Rails 3.0 Release Notes' [ci skip]
    eileencodes committed May 6, 2016
  7. @javiervidal
  8. @vipulnsward

    Merge pull request #24884 from javiervidal/markdown_syntax_2_2_releas…

    …e_notes
    
    Fix markdown syntax in 'Ruby on Rails 2.2 Release Notes' [ci skip]
    vipulnsward committed May 6, 2016
  9. @javiervidal
  10. @kaspth

    Merge pull request #24881 from prathamesh-sonpatki/add-24866-to-relae…

    …se-notes
    
    [ci skip] Release notes: Add PR #24866 to release notes
    kaspth committed May 6, 2016
  11. @prathamesh-sonpatki
Commits on May 5, 2016
  1. @arthurnn

    Merge pull request #24866 from rafaelfranca/actionview-helpers

    Implement helpers proxy in controller instance level
    arthurnn committed May 5, 2016
  2. @rafaelfranca

    Merge pull request #24799 from prathamesh-sonpatki/18439-followup

    Active Model: Improve CHANGELOG and documentation for `validates_acceptance_of` [ci skip]
    rafaelfranca committed May 5, 2016
  3. @rafaelfranca

    Merge pull request #24589 from vipulnsward/am-fragment-cache

    Expand on Action Mailer Fragment caching tests
    rafaelfranca committed May 5, 2016
  4. @prathamesh-sonpatki

    Active Model: Improve CHANGELOG and documentation for `validates_acce…

    …ptance_of` [ci skip]
    
    - Improve CHANGELOG entry for #18439.
    - The documentation is updated as per changes in PR #18439 to the
      `accept` option.
    - The explanation about the virtual attribute is moved at the end so
      that the arity of `accept` option is explained first.
    - Added a note that `message` can also be passed to `validates_acceptance_of`.
    prathamesh-sonpatki committed Apr 30, 2016
  5. @rafaelfranca
  6. @rafaelfranca

    Implement helpers proxy in controller instance level

    It is a common pattern in the Rails community that when people want to
    :xa
    use any kind of helper that is defined inside app/helpers they includes
    the helper module inside the controller like:
    
        module UserHelper
          def my_user_helper
            # ...
          end
        end
    
        class UsersController < ApplicationController
          include UserHelper
    
          def index
            render inline: my_user_helper
          end
        end
    
    This has problem because the helper can't access anything that is
    defined in the view level context class.
    
    Also all public methods of the helper become available in the controller
    what can lead to undesirable methods being routed and behaving as
    actions.
    
    Also if you helper depends on other helpers or even Action View helpers
    you need to include each one of these dependencies in your controller
    otherwise your helper is not going to work.
    
    We already have a helpers proxy at controller class level but that proxy
    doesn't have access to the instance variables defined in the
    controller.
    
    With this new instance level helper proxy users can reuse helpers in the
    controller without having to include the modules and with access to
    instance variables defined in the controller.
    
        class UsersController < ApplicationController
          def index
            render inline: helpers.my_user_helper
          end
        end
    rafaelfranca committed May 5, 2016
  7. @rafaelfranca

    Merge pull request #24869 from vipulnsward/change-example

    Change to use a more realistic example [ci skip]
    rafaelfranca committed May 5, 2016
  8. @rafaelfranca

    Merge pull request #24868 from vipulnsward/delegate_encode_with

    delegate encode_with instead of to_yaml, which is deprecated
    rafaelfranca committed May 5, 2016
  9. @vipulnsward

    Change to use a more realistic example and not giving the impression …

    …that destroy_all is preferred way to destroy related records.
    
    This example just wants to demonstrate callback behaviour.
    
    [ci skip]
    vipulnsward committed May 5, 2016
  10. @vipulnsward
  11. @rafaelfranca

    Merge pull request #24860 from maclover7/jm-rm-space

    Remove extra space [ci skip]
    rafaelfranca committed May 5, 2016
  12. @rafaelfranca

    Move protected instance variable to the right place

    There were a lot of protected instance variables in
    AbsctractController::Rendering that were related to Action Controller
    and Action View.
    
    Moving to ActionController::Base's protected instance list we make it
    closer to where they are really defined.
    rafaelfranca committed May 5, 2016
  13. @kaspth

    [ci skip] Don't promote SQL interpolation.

    After fb898e9, the `before_destroy` had some code that used
    SQL interpolation left over. Don't think we should promote
    that even if the values aren't directly from user input.
    kaspth committed May 5, 2016
  14. @maclover7

    Remove extra space [ci skip]

    maclover7 committed May 5, 2016
  15. @vipulnsward

    Merge pull request #24859 from y-yagi/do_not_pass_conditon_to_destroy…

    …_all
    
    do not pass conditions to `#destroy_all` [ci skip]
    vipulnsward committed May 5, 2016
  16. @y-yagi

    do not pass conditions to `#destroy_all` [ci skip]

    Passing conditions to `#destroy_all` was deprecated in c82c5f8.
    y-yagi committed May 5, 2016
  17. @pixeltrix

    Merge pull request #24780 from rails/run-as-test-in-both-to-time-modes

    Run Active Support tests in both `to_time` modes
    pixeltrix committed May 5, 2016
  18. @pixeltrix

    Run Active Support tests when preserving timezones

    Add to the matrix of Travis tests an entry that runs the Active Support
    tests when `ActiveSupport.to_time_preserves_timezone = true`.
    pixeltrix committed with pixeltrix Apr 28, 2016
  19. @pixeltrix

    Fix tests when preserving timezones

    These two tests are explicitly testing that to_time is returning times
    with the sytem timezone's UTC offset, therefore they will fail when
    running them with `ActiveSupport.to_time_preserves_timezone = true`.
    pixeltrix committed with pixeltrix Apr 28, 2016
  20. @pixeltrix

    Fix to_yaml test when run individually

    The to_yaml method is undefined when running the test as:
    
      $ ruby -I lib:test test/core_ext/string_ext_test.rb
    
    Doesn't fail when running rake test:isolated presumably because
    something else has required 'yaml' already.
    pixeltrix committed with pixeltrix Apr 28, 2016
Commits on May 4, 2016
  1. @kaspth

    Merge pull request #24820 from maclover7/fix-15843

    Ensure compatibility between ActionDispatch::Request::Session and Rack
    kaspth committed May 4, 2016
  2. @maclover7

    Ensure compatibility between ActionDispatch::Request::Session and Rack

    Adding the `each` method is required for ensuring compatibility between
    Rails, and other Rack frameworks (like Sinatra, etc.), that are mounted
    within Rails, and wish to use its session tooling. Prior to this, there
    was an inconsistency between ActionDispatch::Request::Session and
    Rack::Session::Cookie, due to the absence of the `each` method. This
    should hopefully fix that error. :)
    
    For a full integration test with Sinatra and a standalone Rack
    application, you can check out the gist for that here: https://gist.github.com/maclover7/08cd95b0bfe259465314311941326470.
    
    Solves #15843.
    maclover7 committed May 2, 2016
  3. @kaspth

    Merge pull request #24851 from maclover7/jm-bump-ruby-versions

    Bump Ruby versions
    kaspth committed May 4, 2016
  4. @vipulnsward

    Merge pull request #24852 from jrafanie/fix_typos

    Fix some typos in comments [ci skip]
    vipulnsward committed May 4, 2016
Something went wrong with that request. Please try again.