Permalink
Commits on Sep 2, 2015
  1. Add note on custom inflections for engine models

    Mark Thomson committed Sep 2, 2015
  2. Merge pull request #21467 from yui-knk/doc/subscribe

    [ci skip] Add description about which object
    zzak committed Sep 2, 2015
  3. Fix route creation when format is a blank string

    Commit bff61ba, while reducing allocations, caused a regression when an empty
    format is passed to a route.
    
    This can happen in cases where you're using an anchor tag, for example:
    `https://example.com/parent/575256966.#child_1032289285`.
    
    Because of this change `format` was getting sent in
    `parameterized_parts` when previously it was not included. This resulted
    in blank `format`'s being returned as `.` when if there was an extension
    included it would be `.extension`. Since there was no extension this
    caused incorrect URL's.
    
    The test shows this would result in `/posts/show/1.` instead of
    `/posts/show/1` which causes bad urls since the format is not present.
    eileencodes committed Sep 2, 2015
  4. [ci skip] Add description about which object

    `ActiveSupport::Notifications.subscribe` expects as second parameter.
    yui-knk committed Sep 2, 2015
  5. Merge pull request #21462 from ignatiusreza/dev_dep_doc

    fix invalid package name for libmysqlclient-dev mentioned in development_dependencies_install guide
    claudiob committed Sep 2, 2015
  6. [ci skip] fix invalid package name for libmysqlclient-dev

    tested on Ubuntu Desktop 15.04
    ignatiusreza committed Sep 2, 2015
  7. Merge pull request #21451 from kishore-mohan/typo-helper-description

    Typo on helper description and action_controller_overview
    sgrif committed Sep 2, 2015
  8. typo "description not clear corrected with proper description and act…

    …ion_controller_overview file Rails' -> Rails" [ci skip]
    kishore-mohan committed Sep 1, 2015
Commits on Sep 1, 2015
  1. Merge pull request #21456 from rodzyn/clean_requires

    Remove not used requires
    rafaelfranca committed Sep 1, 2015
  2. Respect scale of the column in the Decimal type

    [Rafael Mendonça França + Jean Boussier]
    rafaelfranca committed Sep 1, 2015
  3. Remove not used requires

    rodzyn committed Sep 1, 2015
  4. Merge pull request #21455 from bkeepers/railties-license

    Include MIT-LICENSE in railties gem
    rafaelfranca committed Sep 1, 2015
  5. Merge pull request #21454 from claudiob/fix-failing-tests-on-guides

    Fix: make Travis CI happy about guides again
    rafaelfranca committed Sep 1, 2015
  6. Fix: make Travis CI happy about guides again

    Tests on Rails [are currently failing](https://travis-ci.org/rails/rails/jobs/78255666).
    
    The reason is the dependency of Rails master from gems that are currently on
    GitHub (not on RubyGems) and should be explicitly referenced in the Guides
    test files.
    claudiob committed Sep 1, 2015
  7. Merge pull request #21453 from claudiob/minimum-sprockets-2

    Require sprockets-rails >= 2
    kaspth committed Sep 1, 2015
  8. Require sprockets-rails >= 2

    Fixes rails@4d157ea
    
    Without any specification about the version of sprockets-rails, running a
    `bundle install` on a brand new app might result in sprockets 0.0.1 being
    installed.
    
    However, the minimum requirement is sprockets-rails 2 (see https://github.com/rails/rails/pull/17752/files)
    claudiob committed Sep 1, 2015
  9. Merge pull request #21450 from amitsuroliya/minor_typo

    typo fix [ci skip]
    kaspth committed Sep 1, 2015
  10. Merge pull request #21447 from aditya-kapoor/add-missing-test-am

    Add missing test for #17351
    kaspth committed Sep 1, 2015
  11. typo fix [ci skip]

    sub-project's should be sub-projects' at all places
    amitsuroliya committed Sep 1, 2015
  12. Merge pull request #21444 from etdev/fix-readme-typo-its

    Fix minor typo in README file
    kaspth committed Sep 1, 2015
  13. Fix bug where cookies mutated by request were not persisted

    With changes made in 8363b8 and ae29142 cookies that are mutated on the
    request like `cookies.signed = x` were not retained in subsequent tests,
    breaking cookie authentiation in controller tests.
    
    The test added demonstrates the issue.
    
    The reason we need to select from non-deleted cookies is because without
    checking the `@delete_cookies` the `cookie_jar` `@cookies` will send the
    wrong cookies to be updated. The code must check for `@deleted_cookies`
    before sending an `#update` with the requests cookie_jar cookies.
    This follows how the cookie_jar cookies from the request were updated
    before these changes.
    eileencodes committed Sep 1, 2015
  14. Add missing test for #17351

    aditya-kapoor committed Sep 1, 2015
  15. Fix failure introduced by #17351 due to the new mocks implementation

    It was not expecting the new `case_insensitive` option to be passed to
    `generate_message`, instead of fixing the test we can just not pass this
    option down since it is specific to the confirmation validator and not
    necessary for the error message.
    carlosantoniodasilva committed Sep 1, 2015
  16. Merge pull request #21443 from jashank/fix-17351

    Fix syntax error introduced by #17351.
    carlosantoniodasilva committed Sep 1, 2015
  17. Fix typo in readme file

    etdev committed Sep 1, 2015
  18. Merge pull request #17351 from akshat-sharma/master

    Add case_sensitive option for confirmation validation
    rafaelfranca committed Sep 1, 2015
  19. Merge pull request #21416 from lsylvester/cache-helper-with-relation

    cache helper with relation not working as expected
    rafaelfranca committed Sep 1, 2015
  20. Add case_sensitive option for confirmation validation

    Case :- 1. In case of email confirmation one needs case insensitive comparison
            2. In case of password confirmation one needs case sensitive comparison
    
    [ci skip] Update Guides for case_sensitive option in confirmation validation
    pramod-sharma committed Sep 1, 2015
  21. Merge pull request #19788 from cmdrclueless/actionpack_http_url_ipv6

    Fix broken IPv6 addresses handling
    rafaelfranca committed Sep 1, 2015
  22. Merge pull request #21298 from rodzyn/remove_dead_code

    Remove dead code
    rafaelfranca committed Sep 1, 2015