Permalink
Commits on Jun 23, 2016
  1. Merge pull request #25485 from georgemillo/patch-1

    English fix
    maclover7 committed on GitHub Jun 23, 2016
  2. English fix

    --skip-ci
    georgemillo committed on GitHub Jun 23, 2016
  3. Merge pull request #25480 from kmcphillips/master

    Update changelog for ActiveSupport::Logger.broadcast #silence and config.assets.quiet = true
    rafaelfranca committed on GitHub Jun 23, 2016
  4. Update changelog for #25351

    kmcphillips committed Jun 23, 2016
  5. Update changelog for #25341

    kmcphillips committed Jun 23, 2016
Commits on Jun 22, 2016
  1. Initialize the configuration with a value

    This will fix the failures fixed by
    41488ad
    and keep this new option that is semi-private
    outside of the generated configurations
    rafaelfranca committed Jun 22, 2016
  2. Merge pull request #25473 from bquorning/update-documentation-for-str…

    …ong_parameters
    
    Update documentation for strong parameters
    maclover7 committed on GitHub Jun 22, 2016
  3. Update ActionController::Parameters documentation [ci skip]

    The changes in this commit are twofold:
    
     1. The examples showing `#require` accepting two arguments were wrong - you
        have to wrap the arguments (two, or more) in an array.
     2. `ActionController::Parameters` has an `#inspect` method now (since
        rails#23732), and the documentation should
        reflect that.
    committed Jun 22, 2016
  4. Fix failing railties tests

    Railties tests didn't know about the new config option added in 80b416f so
    it needed to be added to the railties generators for configs.
    eileencodes committed Jun 22, 2016
  5. Add option to enable dependency loading in production

    This will make easier to applications that rely on having const_missing
    hooks in production upgrade to Rails 5.
    
    This option is going to be remove in the future and the default behavior
    will be to disable the dependency loading.
    rafaelfranca committed Jun 22, 2016
  6. Merge pull request #25469 from herminiotorres/update-datetime-to-date…

    …time-local-by-html-specification
    
    Change datetime to datetime-local helper tag
    rafaelfranca committed Jun 22, 2016
  7. Change datetime to datetime-local helper tag

    A change was made in the helper that renders the `datetime`,
    being now by default `datetime-local` and creating
    an alias of `datetime-local` for `datetime`, `datetime` tag and
    it passes to be an abstract class for all other tags that inherit from him.
    
    As a new specification of the HTML 5 the text field type `datetime`
    will no longer exist and will pass a `datetime-local`.
    Ref: https://html.spec.whatwg.org/multipage/forms.html#local-date-and-time-state-(type=datetime-local)
    herminiotorres committed Jun 22, 2016
  8. Merge pull request #25467 from aarongray/tweak_time_helpers_docs_for_…

    …time_zones
    
    Docs: create times using the rails timezone not system timezone [ci skip]
    vipulnsward committed on GitHub Jun 22, 2016
Commits on Jun 21, 2016
  1. Create times in rails timezone not system timezone [ci skip]

    Time.new is a Ruby method that uses system timezone. Traveling in time
    using it is a recipe for confusion. Instead, Time.zone.local should
    be used since it uses the Rails timezone.
    aarongray committed Jun 21, 2016
  2. Merge pull request #25464 from prathamesh-sonpatki/fix-http-request

    update_url is not `get` most of the times [ci skip]
    rafaelfranca committed on GitHub Jun 21, 2016
  3. Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_…

    …field"
    
    The reason we are reverting this commit is because it created breaking
    changes for file upload gems. For more information see discussion here:
    rails#17947 (comment)
    
    This reverts commit c455817, reversing
    changes made to 8b3cd74.
    
    Conflicts:
    	actionview/CHANGELOG.md
    	actionview/lib/action_view/helpers/form_helper.rb
    eileencodes committed Jun 21, 2016
  4. Change the raw template handler to render html-safe strings

    In PR #24929 the changelog was updated to make note that while the new
    template handler was changed to raw this changed the behavior when
    outputting plain html or js files. Previously ERB would output the files
    unescaped. Changing the default handler to RAW meant that these same
    files would be rendered as escaped rather than as js or html.
    
    Because of this change in behavior and after the discussion #24949 in we
    decided to change the behavior of the Raw handler to output html_safe
    strings by default.
    
    Now files rendered with the default handler (raw) render the file
    unescaped.
    eileencodes committed Jun 21, 2016
  5. Merge pull request #25458 from taboularasa/taboularasa/update-docs-Ac…

    …tiveRecord__AttributeSet__YAMLEncoder#decode-for-pr
    
    better docs for ActiveRecord::AttributeSet::YAMLEncoder#decode
    maclover7 committed Jun 21, 2016
  6. Merge pull request #25415 from maclover7/jm-fix-25410

    Add test to better demonstrate `ActiveModel::Errors#added?` behavior
    rafaelfranca committed on GitHub Jun 21, 2016
  7. Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guide

    Fix the docs for supported keyword args or Rails 5 style integration controller tests [ci skip]
    kaspth committed on GitHub Jun 21, 2016
  8. Fix the docs for supported keyword args for Rails 5 style integration…

    … controller tests [ci skip]
    
    - Fixes #25394.
    prathamesh-sonpatki committed Jun 20, 2016
Commits on Jun 20, 2016
  1. Merge pull request #25452 from taboularasa/taboularasa/update-docs-ap…

    …i_documentation_guidelines
    
    [ci skip] correction in command for generating api documentation
    kaspth committed on GitHub Jun 20, 2016
  2. [ci skip] correction in command for generating api documentation

    reverts change in previous commit
    rails@ea4f0e2
    
    docs should prefer to use `rails` over `rake` in the context of an
    application, but in the context of the Rails source this is not the case
    David Elliott committed Jun 20, 2016
  3. Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-wit…

    …h-globbing-route
    
    Fix rails/info routes for apps with globbing route
    schneems committed on GitHub Jun 20, 2016
  4. Merge pull request #25449 from alexcameron89/master

    [ci skip] fix typo in ActiveRecord::ConnectionHandling
    prathamesh-sonpatki committed on GitHub Jun 20, 2016
  5. Fix rails/info routes for apps with globbing route

    The /rails/info routes were inaccessible in apps with a catch-all
    globbing route, as they were being appended after the globbing route and
    would never be matched.
    
    See also ccc3ddb.
    nfm committed Jun 18, 2016
  6. Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-genera…

    …tor-code
    
    No need to have conditional based on api options in assets
    guilleiguaran committed on GitHub Jun 20, 2016
  7. Merge pull request #25420 from michaeldever/mdever_actioncable_develo…

    …pment_ports
    
    Allow actioncable connections from all ports in development
    guilleiguaran committed on GitHub Jun 20, 2016
Commits on Jun 19, 2016
  1. No need to have conditional based on api options in assets

    - As assets are removed for API only apps anyways, so we don't need any
      conditional upfront.
    - assets are removed for API apps here - https://github.com/rails/rails/blob/94ef224aa61ace3fa643eab161ff9056b7d90a62/railties/lib/rails/generators/rails/app/app_generator.rb#L266-L273.
    prathamesh-sonpatki committed Jun 19, 2016
  2. Merge pull request #25436 from prathamesh-sonpatki/fix-tests

    Fix failing railties tests
    schneems committed on GitHub Jun 19, 2016
  3. Fix failing railties tests

    - Railties tests related to fetching asset URL started failing after the
      release of sprockets 3.6.1 on Travis.
    - This was due to the change in
      https://github.com/rails/sprockets/pull/311/files
      which changed the logic in `concat_javascript_sources` to add `;` at
      the end of file if the source did not end with semicolon.
    - Bumped up sprockets minor version and fixed the failing tests.
    prathamesh-sonpatki committed Jun 19, 2016