Permalink
Commits on Jan 13, 2015
  1. Merge pull request #18480 from karpah/patch-1

    Update asset pipeline guide
    claudiob committed Jan 13, 2015
  2. Merge pull request #18479 from mechanicles/change-a-to-an-for-html

    Change a to an for HTML word [ci skip]
    claudiob committed Jan 13, 2015
Commits on Jan 12, 2015
  1. Merge pull request #18439 from mokhan/validates-acceptance-of-array

    allow '1' or true for acceptance validation.
    sgrif committed Jan 12, 2015
  2. Merge pull request #18462 from dmasur/patch-1

    Removing :en in favor of default locale for duration#inspect
    senny committed Jan 12, 2015
  3. Removing :en in favor of I18n.default_locale in duration#inspect

    Hi there,
    
    i have an app without english as available locale. So i got an error when we try to inspect something like 1.day. This is done automatically when we use the dalli cache.
    
    I would like to change the :en to ::I18n.default_locale to be sure that this is always constant and is an available locale.
    
    Tests are all green with this change.
    
    Calculating -------------------------------------
    :locale => :en                              2.024k i/100ms
    :locale => ::I18n.default_locale   2.236k i/100ms
    -------------------------------------------------
    :locale => :en                                  25.758k (±26.3%) i/s -    117.392k
    :locale => ::I18n.default_locale       26.311k (±18.1%) i/s -    127.452k
    Dominik Masur committed Jan 12, 2015
  4. Relax Rack dependency

    Rack is very carefully released, we should be able to upgrade minor
    versions without much effort. We are a bunch of Rails core who are also
    Rack core members so there won't be any issue with that. And in case
    there's something wrong, we should fix on both sides.
    Even though, doesn't seem like we will have a 1.7 version, this will be
    useful as an example for when we go with Rack 2.0. We should ~> 2.0.
    spastorino committed Jan 12, 2015
  5. Merge pull request #18466 from davydovanton/error_message_doc

    Fix description for ActiveModel::Errors#generate_message [skip ci]
    seuros committed Jan 12, 2015
  6. Merge pull request #18460 from mechanicles/a-to-an-for-xml

    Change 'a' to 'an' for 'XML' word [ci skip]
    fxn committed Jan 12, 2015
  7. Merge pull request #18461 from zetsubo/patch-1

    minor grammatical fix in documentation
    matthewd committed Jan 12, 2015
Commits on Jan 11, 2015
  1. Merge pull request #18436 from deepj/fork-detection

    Better fork detection in ActiveSupport::Testing::Isolation
    carlosantoniodasilva committed Jan 11, 2015
  2. Merge pull request #18456 from claudiob/remove-unused-fixtures-to-render

    Remove unused AV fixtures from AP tests
    carlosantoniodasilva committed Jan 11, 2015
  3. Merge pull request #18454 from claudiob/test-on-option-for-amv-callbacks

    Add test for AM::Validation::Callbacks with :on
    carlosantoniodasilva committed Jan 11, 2015
  4. Merge pull request #18455 from claudiob/remove-unused-deprecated_relo…

    …ad-method
    
    Remove unused "deprecated_reload" method
    carlosantoniodasilva committed Jan 11, 2015
  5. Remove unused AV fixtures from AP tests

    When `render` was moved from ActionPack to ActionView in acc8e25,
    some fixtures required by the tests were duplicated, but they are
    actually only required by ActionView tests.
    
    To give one example, `double_render` is already defined [in the AV tests](https://github.com/rails/rails/blob/72139d8d310d896db78eaec98582c7a638135102/actionview/test/actionpack/controller/render_test.rb#L407)
    and is never used in the ActionPack tests.
    claudiob committed Jan 11, 2015
  6. Remove unused "deprecated_reload" method

    The method was introduced in rails@66d0a01#diff-8cec05860729a3851ceb756f4dd90370R49
    for the "reset_changes is deprecated" test, but this test was successively
    removed in rails@37175a2
    claudiob committed Jan 11, 2015
  7. Add test for AM::Validation::Callbacks with :on

    `before_validation` and `after_validation` from
    ActiveModel::Validation::Callbacks accept an optional `:on` parameter
    that was not previously documented or tested. For instance given
    
        before_validation :do_something, on: :create
    
    then `object.valid?(:create)` will invoke `:do_something` while
    `object.valid?` or `object.valid?(:anything_else)` will not.
    claudiob committed Jan 11, 2015
  8. Merge pull request #18448 from robertomiranda/has_secure_token_generator

    Add has secure token to migration generator
    guilleiguaran committed Jan 11, 2015
  9. Merge pull request #18451 from jlduran/guides-sql-caching

    Re-add section in SQL Caching [ci skip]
    rafaelfranca committed Jan 11, 2015
  10. Merge pull request #18452 from claudiob/fix-broken-assertion

    Fix assertion that was never run
    rafaelfranca committed Jan 11, 2015
  11. Fix assertion that was never run

    In order to run whether the `welcome` method of the ActionMailer::Base
    subclass raises an error, `message` must be called, otherwise the method
    is not executed at all.
    
    You could just replace with `def welcome; raise StandardError; end` and you
    would still see a passing test.
    
    This commit fixes the test so the assertion is actually executed, just like
    any other tests in the file, where `.message` is called.
    claudiob committed Jan 11, 2015
  12. Re-add section in SQL Caching

    This section was accidentally removed in 4b5e424, and partially re-added in dc14b89.
    
    [ci skip]
    jlduran committed Jan 11, 2015
  13. Merge pull request #18435 from kuldeepaggarwal/f-remove-unnecessary-r…

    …equire
    
    No need of requiring `rbconfig`, it is by-default loaded
    rafaelfranca committed Jan 11, 2015
  14. Merge pull request #18445 from y-yagi/remove_hide_actions

    remove autoload HideActions, no longer exist
    rafaelfranca committed Jan 11, 2015
Commits on Jan 10, 2015
  1. Deprecate passing a column to `quote`

    It's only used to grab the type for type casting purposes, and we would
    like to remove the type from the columns entirely.
    sgrif committed Jan 10, 2015
  2. Stop passing a column to `quote` in tests

    I'm planning on deprecating the column argument to mirror the
    deprecation in [arel].
    
    [arel]: rails/arel@6160bfb
    sgrif committed Jan 10, 2015
  3. Stop passing a column to `quote` when finding by AR models

    I'm planning on deprecating the column argument to mirror the
    deprecation in [arel].
    
    [arel]: rails/arel@6160bfb
    sgrif committed Jan 10, 2015
  4. Stop passing a column to `quote` when executing from a statement cache

    I'm planning on deprecating the column argument to mirror the
    deprecation in [arel].
    
    [arel]: rails/arel@6160bfb
    sgrif committed Jan 10, 2015