Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 15, 2015
  1. @fxn

    Merge pull request #19345 from davydovanton/doc-fix-spell-guides

    fxn authored
    [skip ci] Fix typos in guides
  2. @davydovanton
  3. @arunagw

    Merge pull request #19344 from davydovanton/doc-fix-spell-actionmailer

    arunagw authored
    [skip ci] Fix typo in actionmailer documentation
  4. @davydovanton
  5. @arthurnn

    Merge pull request #19342 from yui-knk/fix/missed_link

    arthurnn authored
    [ci skip] Fix dead link
  6. @yui-knk

    [ci skip] Fix dead link

    yui-knk authored
    getting_started.html#the-mvc-architecture is lost by this commit
    2f06c94 (Mar 14 2012 !).
    
    So replace it with wikipedia link.
  7. @eileencodes

    Fix leaky chain on polymorphic association

    eileencodes authored
    If there was a polymorphic hm:t association with a scope AND second
    non-scoped hm:t association on a model the polymorphic scope would leak
    through into the call for the non-polymorhic hm:t association.
    
    This would only break if `hotel.drink_designers` was called before
    `hotel.recipes`. If `hotel.recipes` was called first there would be
    no problem with the SQL.
    
    Before (employable_type should not be here):
    ```
    SELECT COUNT(*) FROM "drink_designers" INNER JOIN "chefs" ON
    "drink_designers"."id" = "chefs"."employable_id" INNER JOIN
    "departments" ON "chefs"."department_id" = "departments"."id" WHERE
    "departments"."hotel_id" = ? AND "chefs"."employable_type" = ?
    [["hotel_id", 1], ["employable_type", "DrinkDesigner"]]
    ```
    
    After:
    ```
    SELECT COUNT(*) FROM "recipes" INNER JOIN "chefs" ON "recipes"."chef_id"
    = "chefs"."id" INNER JOIN "departments" ON "chefs"."department_id" =
    "departments"."id" WHERE "departments"."hotel_id" = ?  [["hotel_id", 1]]
    ```
    
    From the SQL you can see that `employable_type` was leaking through when
    calling recipes. The solution is to dup the chain of the polymorphic
    association so it doesn't get cached. Additionally, this follows
    `scope_chain` which dup's the `source_reflection`'s `scope_chain`.
    
    This required another model/table/relationship because the leak only
    happens on a hm:t polymorphic that's called before another hm:t on the
    same model.
    
    I am specifically testing the SQL here instead of the number of records
    becasue the test could pass if there was 1 drink designer recipe for the
    drink designer chef even though the `employable_type` was leaking through.
    This needs to specifically check that `employable_type` is not in the SQL
    statement.
  8. @pixeltrix

    Merge pull request #19339 from y-yagi/mailer_preview_comment

    pixeltrix authored
    add mailer suffix to comments for email previews
  9. @claudiob

    Merge pull request #19340 from keepcosmos/association-doc-fix

    claudiob authored
    [ci skip]Doc fix about association hierarchy
  10. @keepcosmos
Commits on Mar 14, 2015
  1. @y-yagi
  2. @carlosantoniodasilva
  3. @arunagw

    Merge pull request #19337 from mnaberez/fix-actionpack-changelog-typo

    arunagw authored
    Fix typo in Action Pack changelog
  4. @mnaberez
  5. @tchandy

    Cleaning JavaScriptHelperTest

    tchandy authored
  6. @tchandy
  7. @tchandy
  8. @tchandy
  9. @tchandy

    Deleting unused fixtures

    tchandy authored
  10. @arthurnn

    Merge pull request #19335 from JahBrewski/master

    arthurnn authored
    [ci skip] Subject-verb agreement
  11. @JahBrewski
  12. @arthurnn
Commits on Mar 13, 2015
  1. @rafaelfranca

    Merge pull request #19322 from AndrewHendrie/AndrewHendrie-guides-tes…

    rafaelfranca authored
    …ting-partials-patch
    
    Asserting partials modification
  2. @rafaelfranca

    Merge pull request #19323 from naoty/rake_initializer

    rafaelfranca authored
    Add `rake initializer`
  3. @naoty

    Add `rake initializer`

    naoty authored
    This task prints out initializers for an application. It is useful to
    develop a rubygem which involves the initialization process.
  4. @ress @carlosantoniodasilva

    Added missing closing brace in sample code for safe HTML translations

    ress authored carlosantoniodasilva committed
    Closes #19321. [ci skip]
  5. @AndrewHendrie

    Asserting partials modification

    AndrewHendrie authored
    Changed "create Articles view" to "new article view". The create action doesn't typically have a view assigned to it. The view that's being referred to is the 'new' Article view.
  6. @rafaelfranca

    Merge pull request #19291 from hired/return-truthy-value-from-head

    rafaelfranca authored
    Return truthy value from head method
  7. @rafaelfranca

    Merge pull request #19311 from square/aj-adapter-lookup

    rafaelfranca authored
    `QueueAdapters` now does lazy lookup
  8. @rafaelfranca

    Merge pull request #19315 from josh/update-sprockets-links

    rafaelfranca authored
    Update sprockets links to point to rails org
  9. @josh @rafaelfranca

    Update sprockets links to point to rails org

    josh authored rafaelfranca committed
  10. @seuros

    Merge pull request #19317 from kuldeepaggarwal/doc-select-tag-output

    seuros authored
    [ci skip] correct output of select
  11. @tamird

    `QueueAdapters` does the lookup

    tamird authored
  12. @kuldeepaggarwal
Commits on Mar 12, 2015
  1. @joelmichael

    Return true from head method

    joelmichael authored
    It was returning false in normal circumstances.
    This broke the `head :ok and return if` construct.
    Add appropriate test.
Something went wrong with that request. Please try again.