Permalink
Switch branches/tags
Commits on Dec 20, 2015
  1. Merge pull request #22704 from rajcybage/mysql_fix

    sgrif committed Dec 20, 2015
    mysql2 adapter instead of mysql [ci skip]
  2. mysql2 adapter instead of mysql [ci skip]

    Rajarshi Das
    Rajarshi Das committed Dec 20, 2015
  3. Merge pull request #22707 from yui-knk/fix_warning

    schneems committed Dec 20, 2015
    Suppress warning ambiguous first argument
  4. Suppress warning ambiguous first argument

    yui-knk committed Dec 20, 2015
    Suppress warning (warning: ambiguous first argument; put
    parentheses or a space even after `/' operator)
  5. Merge branch 'master' of github.com:rails/docrails

    vijaydev committed Dec 20, 2015
  6. Fix documentation for mattr_accessor methods

    Jan Habermann
    Jan Habermann committed Dec 20, 2015
  7. Add a commend about deprecation of ActiveSupport::OrderedHash

    rafaelfranca committed Dec 20, 2015
    It is in the code to provides backward compatibility for people that
    have this class serialized as YAML in some storage.
    
    Closes #22681
Commits on Dec 19, 2015
  1. Merge pull request #22697 from kamipo/remove_unused_mysql_specific_sc…

    senny committed Dec 19, 2015
    …hema
    
    Remove unused `test/schema/mysql_specific_schema.rb`
  2. Merge pull request #22699 from omotenko/patch-1

    kaspth committed Dec 19, 2015
    Update README.md
  3. Update README.md

    omotenko committed Dec 19, 2015
  4. Remove unused `test/schema/mysql_specific_schema.rb`

    kamipo committed Dec 19, 2015
    Follow up to #22642.
  5. Fix `test_find_with_order_on_included_associations_with_construct_fin…

    kamipo committed Nov 12, 2015
    …der_sql_for_association_limiting_and_is_distinct` to NULL-agnostic way
    
    The sort order of NULL depends on the RDBS implementation. This commit
    is to fix the test to NULL-agnostic way.
    
    Example:
    
        ```
        activerecord_unittest=# SELECT  DISTINCT "posts"."id", author_addresses_authors.id AS alias_0 FROM "posts" LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id" LEFT OUTER JOIN "author_addresses" ON "author_addresses"."id" = "authors"."author_address_id" LEFT OUTER JOIN "categorizations" ON "categorizations"."category_id" = "posts"."id" LEFT OUTER JOIN "authors" "authors_posts" ON "authors_posts"."id" = "categorizations"."author_id" LEFT OUTER JOIN "author_addresses" "author_addresses_authors" ON "author_addresses_authors"."id" = "authors_posts"."author_address_id" ORDER BY author_addresses_authors.id DESC;
         id | alias_0
        ----+---------
          1 |
          2 |
          3 |
          4 |
          5 |
          6 |
          7 |
          8 |
          9 |
         10 |
         11 |
          1 |       1
        (12 rows)
        ```
    
        ```
        root@localhost [activerecord_unittest] > SELECT  DISTINCT `posts`.`id`, author_addresses_authors.id AS alias_0 FROM `posts` LEFT OUTER JOIN `authors` ON `authors`.`id` = `posts`.`author_id` LEFT OUTER JOIN `author_addresses` ON `author_addresses`.`id` = `authors`.`author_address_id` LEFT OUTER JOIN `categorizations` ON `categorizations`.`category_id` = `posts`.`id` LEFT OUTER JOIN `authors` `authors_posts` ON `authors_posts`.`id` = `categorizations`.`author_id` LEFT OUTER JOIN `author_addresses` `author_addresses_authors` ON `author_addresses_authors`.`id` = `authors_posts`.`author_address_id` ORDER BY author_addresses_authors.id DESC;
        +----+---------+
        | id | alias_0 |
        +----+---------+
        |  1 |       1 |
        |  3 |    NULL |
        |  1 |    NULL |
        |  2 |    NULL |
        |  4 |    NULL |
        |  5 |    NULL |
        |  6 |    NULL |
        |  7 |    NULL |
        |  8 |    NULL |
        |  9 |    NULL |
        | 10 |    NULL |
        | 11 |    NULL |
        +----+---------+
        12 rows in set (0.00 sec)
        ```
  6. Deprecation warning now targets at 5.1

    amatsuda committed Dec 19, 2015
    Also, added a test case to make sure that the default deprecation horizon is
    always bigger than the current Rails version.
  7. Merge pull request #22695 from sachin21/remove_ds_store

    guilleiguaran committed Dec 19, 2015
    Remove .DS_Store
  8. Remove .DS_Store

    sachin21 committed Dec 19, 2015
  9. Merge pull request #22479 from RobinClowers/fix-cache-notification-order

    kaspth committed Dec 19, 2015
    Fix cache fetch miss notification order
  10. Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Act…

    schneems committed Dec 19, 2015
    …ions__CreateMigration
    
    Add No Doc
  11. Merge pull request #22690 from claudiob/remove-blank-line

    schneems committed Dec 19, 2015
    Remove blank line generated in config.ru
  12. Merge pull request #22678 from akshay-vishnoi/base_test_case

    guilleiguaran committed Dec 19, 2015
    [ActionCable] declare asset_logged private
  13. Merge pull request #22688 from claudiob/doc-cookie-serializer

    guilleiguaran committed Dec 19, 2015
    Explain what initializer/config_serializer does
  14. Remove blank line generated in config.ru

    claudiob committed Dec 19, 2015
    Follow the lines of the other `.tt` files ([example](https://github.com/rails/rails/blob/1611ab4db173a7596a7a94c58dabf1483f070304/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L26)) that have the space after the
    condition to avoid too many white lines in the resulted file.
  15. Add No Doc

    gwincr11 committed Dec 19, 2015
    In reference to rails/rail#22403 add a :nodoc:
  16. Explain what initializer/config_serializer does

    claudiob committed Dec 19, 2015
    In line with the other initializers, add a short comment that explains
    what happens when you change the value of the initializer.
    
    [ci skip]
  17. Merge pull request #22687 from claudiob/doc-cookie-serializer

    claudiob committed Dec 19, 2015
    initializers/cookies_serializer is not new to 5.0
  18. Merge pull request #19423 from yuroyoro/fix_performance_regression_of…

    tenderlove committed Dec 19, 2015
    …_preloading_has_many_through_relation
    
    Fix #12537 performance regression when preloading has_many_through association
  19. Merge pull request #22682 from y-yagi/fix_typo_in_changelog

    sgrif committed Dec 19, 2015
    fix typo in config value [ci skip]
Commits on Dec 18, 2015
  1. [ActionCable] declare asset_logged private

    Akshay Vishnoi
    Akshay Vishnoi committed Dec 18, 2015
  2. Merge pull request #22671 from habermann24/patch-1

    rafaelfranca committed Dec 18, 2015
    Fix typo in CHANGELOG
  3. Fix typo in CHANGELOG

    Jan
    Jan committed Dec 18, 2015