Skip to content
This repository
branch: master

Apr 24, 2014

  1. Yves Senn

    move AR length validation tests into separate test-case.

    Conflicts:
    	activerecord/test/cases/validations/association_validation_test.rb
    authored March 25, 2013
  2. Jeremy Kemper

    No need for trailing slash on migration path.

    Causes a double // in Dir.glob that breaks Ruby 2.2-trunk.
    Not really a bug, but not relevant to this test either.
    
    Originally added in ed21f0c
    authored April 24, 2014
  3. Yves Senn

    reset `@arel` when modifying a Relation in place.

    authored April 24, 2014
  4. Yves Senn

    Merge pull request #14859 from jefflai2/datetime_type

    PostgreSQL Timestamps always map to `:datetime`.
    authored April 24, 2014
  5. Jefferson Lai

    PostgreSQL Timestamps always map to `:datetime`.

    The PG Adapter should use `:datetime` consistently instead of mapping
    mispellings to `:timestamp`.
    
    See #14513
    authored April 24, 2014
  6. Santiago Pastorino

    Merge pull request #14856 from Gaurav2728/gaurav-typo_fix

    [ci skip] Improve formatting and yml
    authored April 24, 2014
  7. Gaurav Sharma

    [ci skip] Improve formatting and yml

    authored April 16, 2014
  8. Robin Dupret

    Merge pull request #14858 from ebouchut/patch-1

    Fix a typo in the doc of forty_two AR FinderMethod [ci skip]
    authored April 24, 2014
  9. Eric Bouchut

    Fix a typo in the doc of forty_two AR FinderMethod

    authored April 24, 2014

Apr 23, 2014

  1. Santiago Pastorino

    Merge pull request #14843 from tgxworld/improve_readability_of_contri…

    …buting_to_rails_guide
    
    [ci skip] Improve readability of contributing to rails guide.
    authored April 23, 2014
  2. Rafael Mendonça França

    Merge pull request #14852 from matthewd/fix_build_for_assets

    Fix railties asset tests: precompile the image we're referencing
    authored April 23, 2014
  3. Improve readability of contributing to rails guide. [ci skip]

    authored April 23, 2014
  4. Matthew Draper

    Precompile the image we're referencing, too.

    You can't compile a file that references a non-compiled asset's path.
    
    .. unless you turn off asset runtime errors.
    
    Outside of a test case like this, `config.assets.precompile` would
    normally retain its default entry, which precompiles all images (and
    other non-JS/CSS files) that are in `app/assets`.
    authored April 24, 2014
  5. Yves Senn

    Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks

    Move `NoTouching` down the inheritance chain on AR::Base
    authored April 23, 2014
  6. Lucas Mazza

    `ActiveRecord::Base.no_touching` no longer triggers callbacks or star…

    …t empty transactions.
    
    Closes #14841.
    authored April 22, 2014
  7. Guillermo Iguaran

    Merge pull request #14850 from chancancode/fix_json_cookie_jar

    Fixed an issue with migrating legacy json cookies.
    authored April 23, 2014
  8. Godfrey Chan

    Fixed an issue with migrating legacy json cookies.

    Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming
    cookies are marshal-encoded. This is not the case when `secret_token` is
    used in conjunction with the `:json` or `:hybrid` serializer.
    
    In those case, when upgrading to use `secret_key_base`, this would cause a
    `TypeError: incompatible marshal file format` and a 500 error for the user.
    
    Fixes #14774.
    
    *Godfrey Chan*
    authored April 23, 2014
  9. Arthur Nogueira Neves

    Merge pull request #14840 from akshay-vishnoi/doc_changes

    Correct comment [ci skip]
    authored April 23, 2014
  10. Akshay Vishnoi

    Correct comment [ci skip]

Apr 22, 2014

  1. Rafael Mendonça França

    Perfer to define methods instead of calling test

    This file is using this pattern already
    authored April 22, 2014
  2. Rafael Mendonça França

    Fix syntax error

    authored April 22, 2014
  3. Rafael Mendonça França

    Add CHANGELOG entry for #14757 [ci skip]

    authored April 22, 2014
  4. Rafael Mendonça França

    Merge pull request #14757 from estsauver/14752

    Fix behavior of select! to be consistent with select #14752
    authored April 22, 2014
  5. Rafael Mendonça França

    Merge pull request #14573 from habermann24/has_many_through_fix

    Properly handle scoping with has_many :through. Fixes #14537.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/associations/has_many_through_associations_test.rb
    authored April 22, 2014
  6. Rafael Mendonça França

    Merge pull request #14801 from kuldeepaggarwal/fix-string-inflection

    Fix inconsistent behavior from String#pluralize
    authored April 22, 2014
  7. Yves Senn

    Merge pull request #14836 from jonatack/patch-5

    Fix run-on sentences and improve grammar [skip ci]
    authored April 22, 2014
  8. Jon Atack

    Fix run-on sentences and improve grammar [skip ci]

    authored April 22, 2014
  9. Rafael Mendonça França

    Merge pull request #13335 from glorieux/favicon_link_tag_mimetype

    Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon.
    authored April 22, 2014
  10. Rafael Mendonça França

    Merge pull request #10764 from mokevnin/replace_class_eval_by_define_…

    …method
    
    replace class_eval by define_method in abstract_controller/callbacks
    authored April 22, 2014
  11. Rafael Mendonça França

    Merge pull request #14835 from zzak/test_form_helper_label_with_block…

    …_and_html
    
    Add test for using ActionView::Helpers::FormHelper.label with block and html
    authored April 22, 2014
  12. Zachary Scott

    Add test for using ActionView::Helpers::FormHelper.label with block a…

    …nd html
    authored April 22, 2014

Apr 21, 2014

  1. Earl St Sauver

    select! renamed to avoid name collision Array#select!

    Fixes #14752
    
    Select mimics the block interface of arrays, but does not mock the
    block interface for select!. This change moves the api to be a
    private method, _select!.
    authored April 15, 2014
  2. Jeremy Kemper

    Rearrange deck chairs on the titanic. Organize connection handling te…

    …st cases.
    authored April 21, 2014
  3. Geoffroy Lorieux

    Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon…

    … to image/x-icon.
    
    Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon,
    registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products.
    The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market.
    authored December 16, 2013

Apr 20, 2014

  1. Arthur Nogueira Neves

    Merge pull request #14826 from stevegraham/action_controller_renderer…

    …_doc_fix
    
    ActionController::Renderers documentation fix
    authored April 20, 2014
Something went wrong with that request. Please try again.