Permalink
Switch branches/tags
Commits on Jul 15, 2018
  1. Merge pull request #33366 from ahorek/fix_selector

    kamipo committed Jul 15, 2018
    fix test_should_impose_childless_html_tags_in_html failure with JRuby
  2. Merge pull request #33365 from lanzhiheng/fix-document-issue-about-ac…

    kamipo committed Jul 15, 2018
    …tive-record-callbacks-after_touch
    
     Fix document issue in active record callback about `after_touch` hook.
    
    [ci skip]
  3. test_should_impose_childless_html_tags_in_html failure with JRuby

    pavel
    pavel committed Jul 15, 2018
Commits on Jul 14, 2018
  1. Merge pull request #33361 from jhubert/bugfix/fix-added-string-attrib…

    eileencodes committed Jul 14, 2018
    …utes
    
    Fix regression in use of string attribute in the added? method
  2. Ensure attribute is a symbol in the added? method

    jhubert committed Jul 14, 2018
  3. Merge pull request #33360 from jedrekdomanski/Update-active-record-qu…

    eileencodes committed Jul 14, 2018
    …erying-readme
    
    Update documentation for #pluck method [ci skip]
Commits on Jul 13, 2018
Commits on Jul 12, 2018
  1. Merge pull request #33340 from ttanimichi/patch-1

    rafaelfranca committed Jul 12, 2018
    [ci skip] `sanitizer_vendor` will be removed in Rails 6
  2. Merge pull request #33341 from Edouard-chin/ec-fix-to-param

    rafaelfranca committed Jul 12, 2018
    e4e1b62 broke `to_param` handling:
  3. Merge pull request #33350 from kamipo/address_blank_lines_automatically

    rafaelfranca committed Jul 12, 2018
    Enable `Layout/EmptyLinesAroundBlockBody` to reduce review cost in the future
  4. e4e1b62 broke `to_param` handling:

    Edouard-chin committed Jul 11, 2018
    - There was an issue inside controller tests where order params were not respected, the reason
      was because we were calling `Hash#to_query` which sorts the results lexicographically.
      1e4e1b62 fixed that issue by not using `to_query` but instead a utility function provided by rack.
    - However with the fix came another issue where it's now no longer possible to do this
    
      ```
       post :foo, params: { user: User.first }
    
       # Prior to the patch the controller will receive { "user" => "1" }
       # Whereas now you get { "user": "#<User: ...>" }
      ```
    
      The fix in this PR is to modify `Hash#to_query` to sort only when it
      doesn't contain an array structure that looks something like "bar[]"
    
      Ref #33341 (comment)
  5. Enable `Layout/EmptyLinesAroundBlockBody` to reduce review cost in th…

    kamipo committed Jul 12, 2018
    …e future
    
    We sometimes ask "✂️ extra blank lines" to a contributor in reviews like
    #33337 (comment).
    
    It is preferable to deal automatically without depending on manpower.
  6. Remove overly-broad retry in ActiveStorage::PurgeJob

    georgeclaghorn committed Jul 12, 2018
    We've never intentionally tripped this retry in production. Add retries for specific errors as needed.
Commits on Jul 11, 2018
  1. Merge pull request #28327 from rngtng/add-seed-dependency

    rafaelfranca committed Jul 11, 2018
    Add missing env & config dependency to `rake db:seed`
Commits on Jul 10, 2018
  1. Merge pull request #33336 from bogdanvlviv/fix-stubbed-methods-in-tes…

    rafaelfranca committed Jul 10, 2018
    …t-cases
    
    Fix stubbed methods in test cases
  2. Fix stubbed methods in test cases

    bogdanvlviv committed Jul 10, 2018
    Remove returning of `false` value for stubbed `lock_thread=` methods
    since there aren't any needs in it.
    
    Remove unnecessary returning of `true` for stubbed `drop_database` method.
    Follow up #33309.
    
    Related to #33162, #33326.
  3. Merge pull request #33326 from utilum/replace_shallow_mocks_with_ruby

    kamipo committed Jul 10, 2018
    Replace shallow mocks with Ruby classes
  4. Add missing load config dependency to `rake db:seed`

    rngtng committed Oct 7, 2015
  5. Replace shallow mocks with Ruby classes

    utilum committed Jul 10, 2018
    While preparing this I realised that some stubbed returns values
    serve no purpose, so this patch drops those as well.
    
    Step 3 in #33162
Commits on Jul 9, 2018
  1. Merge pull request #33322 from utilum/test_value_instead_of_method_call

    rafaelfranca committed Jul 9, 2018
    Reduce mocking by testing value instead of method call
  2. Reduce mocking by testing value instead of method call

    utilum committed Jun 20, 2018
    Step 2 in #33162
  3. Merge pull request #33309 from utilum/remove_unnecessary_mocha_stubs

    rafaelfranca committed Jul 9, 2018
    Remove unnecessary Mocha stubs
  4. Merge pull request #33308 from anniecodes/notes-command-changelog

    rafaelfranca committed Jul 9, 2018
    Add rake notes and SOURCE_ANNOTATION_DIRECTORIES deprecation to Changelog
  5. Add deprecations related to `rails notes` command to Changelog

    anniecodes committed Jul 6, 2018
    * SOURCE_ANNOTATION_DIRECTORIES deprecation
    * Deprecation of `rake notes`, use `rails notes` instead
    * Deprecation of `rails notes:custom ANNOTATION=custom`, `rails notes:optimize`, `rails notes:todo`, and `rails notes:fixme` in favor of passing `-annotations` or `-a` to `rails notes`
    * They have all  been deprecrated in #33220
  6. SQLite: Don't leak internal schema objects

    kamipo committed Jul 9, 2018
    Related #31201.
    
    If creating custom primary key (like a string) in SQLite, it would also
    create an internal index implicitly which named begin with "sqlite_".
    
    It need to be hidden since the internal object names are reserved and
    prohibited for public use.
    
    See https://www.sqlite.org/fileformat2.html#intschema
    
    Fixes #33320.
Commits on Jul 8, 2018
  1. Merge pull request #33280 from nkondratyev/fix/mysql-time-default-values

    kamipo committed Jul 8, 2018
    Fix default value for mysql time types with specified precision