Permalink
Commits on Jan 19, 2017
  1. update CREATE TABLE statements generated by `sqlite3` command

    From SQLite 3.16.0, `IF NOT EXISTS` set to CREATE TABLE statements.
    Ref: https://www.sqlite.org/src/info/c7021960f5c070fb
    
    Fixes #27635.
    
    (cherry picked from commit bdc8818)
    y-yagi committed with pixeltrix Jan 19, 2017
  2. `find_templates` should be able to handle 5 arguments

    (cherry picked from commit c406cf2)
    kenta-s committed with pixeltrix Jan 18, 2017
  3. Allocation free Integer#to_s

    (cherry picked from commit b9bda7f)
    byroot committed with pixeltrix Jan 19, 2017
Commits on Jan 18, 2017
  1. Use ActionDispatch::IntegrationTest http helper methods

    Mixing Rack::Test::Methods into ActionDispatch::IntegrationTest seems
    to trigger Ruby bug 13107[1]. By using our methods instead of rack-test
    we shouldn't trigger the bug in Forwardable.
    
    [1]: https://bugs.ruby-lang.org/issues/13107
    
    (cherry picked from commit fad09da)
    pixeltrix committed Jan 18, 2017
  2. 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
        #23732), and the documentation should
        reflect that.
    
    Fixes #27658
    bquorning committed with rafaelfranca Jun 22, 2016
  3. Merge pull request #27720 from y-yagi/follow_up_to_27713_5_0_stable

    restore class and module deleted by mistake
    rafaelfranca committed on GitHub Jan 18, 2017
  4. restore class and module deleted by mistake

    Tests using these are deleted with c32ccd8,
    which is unnecessary in master, but still necessary for 5-0-stable.
    
    Follow up to 9f4fc67
    y-yagi committed Jan 18, 2017
  5. Merge pull request #27713 from coreyward/module_freeze_parent_name

    Module#parent_name broken for frozen classes
    rafaelfranca committed with rafaelfranca Jan 18, 2017
  6. Merge pull request #26288 from maclover7/jm-revert-21995

    Update `Rails.configuration` documentation
    guilleiguaran committed with rafaelfranca Aug 26, 2016
  7. Merge pull request #27692 from y-yagi/make_render_work_with_ac_params

    make `render` work with AC::Params
    eileencodes committed with rafaelfranca Jan 16, 2017
Commits on Jan 17, 2017
  1. Move config reset to ensure block

    We don't want to leak the extra migration path to other railties tests.
    
    (cherry picked from commit 33eef3f)
    pixeltrix committed Jan 17, 2017
  2. Move config reset to ensure block

    We don't want to leak the extra migration path to other railties tests.
    
    (cherry picked from commit a0e0505)
    pixeltrix committed Jan 17, 2017
  3. Generate migrations at path set by `config.paths["db/migrate"]`

    (cherry picked from commit c942361)
    kjg committed with pixeltrix Jan 13, 2017
  4. Merge pull request #27703 from metaskills/sqlserver-5-0-stable

    Allow SQLServerAdapter To Opt Into A Few Tests
    rafaelfranca committed on GitHub Jan 17, 2017
Commits on Jan 16, 2017
Commits on Jan 15, 2017
  1. Allow render locals to be assigned to instance variables

    In #26672 we blocked use of Ruby keywords as identifiers for view
    locals but inadvertently broke the use of instance variable names
    as identifiers. Whilst not explicitly documented this behavior has
    been around for a long time and there's no need to break it now.
    
    Fixes #27480.
    
    (cherry picked from commit b5edc55)
    pixeltrix committed Jan 15, 2017
Commits on Jan 14, 2017
  1. Merge pull request #27656 from y-yagi/fix_method_name_in_renderer_doc

    fix method name in `Renderer` doc [ci skip]
    prathamesh-sonpatki committed with kaspth Jan 12, 2017
  2. CI against newer rubies

    amatsuda committed Jan 14, 2017
  3. Fix pool_from_any_process to use most recent spec

    If a process is forked more than once, the pool was grabbing the oldest
    spec, not the most recent spec. This wasn't noticed before because most
    folks are lilely forking the process only once.
    
    If you're forking the process multiple times however the wrong spec name
    will be returned and an incorrect connection will be used for the
    process.
    
    This fixes the issue by reversing the list of spec names so we can grab
    the most recent spec rather than the oldest spec.
    eileencodes committed Jan 14, 2017
Commits on Jan 12, 2017
  1. Revert "Merge pull request #27586 from maclover7/jm-fix-27584"

    This reverts commit cf51e74.
    
    Reason: It caused regression and the test case is in the issue.
    rafaelfranca committed Jan 12, 2017
Commits on Jan 11, 2017
  1. Make ActionDispatch::Request.parameter_parsers public API

    It is the proper way to configure custom parameters parser and it was
    being recommended in the deprecation for ActionDispatch::ParamsParser.
    
    [ci skip]
    rafaelfranca committed Jan 11, 2017
Commits on Jan 10, 2017
  1. Merge pull request #27613 from prathamesh-sonpatki/add-missing-entry-…

    …to-release-notes
    
    Add missing release notes entry for f02a35b [ci skip]
    kaspth committed Jan 10, 2017
  2. Make time travel work with subclasses of Time/Date/Datetime

    Closes #27614
    
    Previously when calling `now` on a subclass of e.g. `Time` it would return an instance of `Time` instead of returning an instance of the subclass. This way, we always return the correct class.
    (cherry picked from commit 3d78949)
    jnicklas committed with pixeltrix Jan 9, 2017
Commits on Jan 9, 2017
  1. Merge pull request #25506 from y-yagi/return_correct_from_enum_type

    return correct type from `EnumType`
    sgrif committed with kaspth Jun 24, 2016
  2. Merge pull request #27620 from schneems/schneems/backport-27596

    Preserve `up` and `down` return type
    rafaelfranca committed on GitHub Jan 9, 2017
  3. Followup of #27596, test output of "run" method as well

    - #27596 Updated "run" and "migrate" method for returning correct
       value but only added test for "migrate" method. This commit adds a
       test for "run" as well.
    prathamesh-sonpatki committed with schneems Jan 7, 2017
  4. Preserve `up` and `down` return type

    In Rails 4.2 calling `ActiveRecord::Migrator.migrate` would return an array of results. Without realizing that this return type was expected I accidentally introduced a change in 4d60e93
    
    This PR preserves the previous behavior and adds a test on the return type. This is a backport to the 5-0-stable branch.
    schneems committed Jan 6, 2017
Commits on Jan 8, 2017
  1. Merge pull request #25427 from eugeneius/update_increment_documentation

    Update increment! documentation [ci skip]
    kaspth committed Jan 8, 2017
  2. Merge pull request #27604 from prathamesh-sonpatki/dont-generate-erb-…

    …views-for-api-scaffold-controller
    
    Don't generate HTML/ERB templates for scaffold controller with --api flag
    kaspth committed Jan 8, 2017
  3. Merge pull request #27442 from kamipo/fix_27434

    Add a record to target before any callbacks loads the record
    eileencodes committed with kaspth Dec 27, 2016
  4. Update i18n guide about how to change locale and translations paths […

    …ci skip]
    
    - config/application.rb no longer has comments about how to specify load paths
      or change default locale after
      28dcadc.
    prathamesh-sonpatki committed with kaspth May 22, 2016
Commits on Jan 6, 2017
  1. Merge pull request #27586 from maclover7/jm-fix-27584

    Update `cookies` helper on all HTTP requests
    rafaelfranca committed with rafaelfranca Jan 6, 2017