Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: 4-0-stable
Commits on Apr 20, 2015
  1. @arthurnn

    Merge pull request #19828 from JuanitoFatas/patch-2

    arthurnn authored
    [ci skip] Fix broken strict option link in MySQL adapter (4-0-stable)
  2. @JuanitoFatas
Commits on Jan 6, 2015
  1. @rafaelfranca
  2. @arthurnn @rafaelfranca
  3. @rafaelfranca

    Do no unescaped already unescaped bytea values

    rafaelfranca authored
    If the unescaped value contains a null byte, pg 0.18 will raise an
    exception.
  4. @rafaelfranca
Commits on Jan 2, 2015
  1. @rafaelfranca

    Check by @v before converting the entry on expired?

    rafaelfranca authored
    We should convert when @v is defined not @value.
    
    The test was calling value first that already converts the entry so we
    are not catching this bug.
  2. @rafaelfranca
Commits on Dec 29, 2014
  1. @rafaelfranca

    Fix type [ci skip] :bomb:

    rafaelfranca authored
  2. @rafaelfranca

    Merge pull request #11085 from acapilleri/partial_exception_message

    rafaelfranca authored
    fix identifier error message of partial with unvalid charter
    
    Conflicts:
    	actionview/CHANGELOG.md
    
    Conflicts:
    	actionview/CHANGELOG.md
  3. @matthewd @rafaelfranca

    As of Unicode 6.3, Mongolian Vowel Separator is not whitespace

    matthewd authored rafaelfranca committed
    Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's
    not a good candidate for testing String#squish.
  4. @rafaelfranca
  5. @rafaelfranca

    i18n.enforce_available_locales overrides the I18n configuration

    rafaelfranca authored
    This will make Rails work with i18n 0.6 and 0.7.
  6. @rafaelfranca

    Merge pull request #18236 from vipulnsward/dont-eval-frozen

    rafaelfranca authored
    Fix html_safe string access modifying frozen values
    
    Conflicts:
    	activesupport/lib/active_support/core_ext/string/output_safety.rb
    	activesupport/test/safe_buffer_test.rb
  7. @rafaelfranca

    Test with Ruby 2.2

    rafaelfranca authored
Commits on Dec 12, 2014
  1. @matthewd

    Merge pull request #17186 from tgxworld/header_authentication_token

    matthewd authored
    Allow authentication header to not have to specify 'token=' key.
    
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca @matthewd

    Merge pull request #16011 from xjlu/token_and_options

    rafaelfranca authored matthewd committed
    Improve token_and_options regex and test
Commits on Dec 9, 2014
  1. @rafaelfranca

    Don't rely on `Time.current` is tests

    rafaelfranca authored
    Millisecond inequality causes failures on Travis
  2. @rafaelfranca

    Merge pull request #17975 from merongivian/add_test_for_search_field

    rafaelfranca authored
    Fix options overwritten by super
    Conflicts:
    	actionpack/lib/action_view/helpers/tags/text_field.rb
Commits on Dec 2, 2014
  1. @senny

    Merge pull request #17876 from claudiob/fix-tests-on-4-0-stable

    senny authored
    Fix tests on 4-0-stable
  2. @senny @claudiob
  3. @prathamesh-sonpatki @claudiob

    Fix broken string_ext_test due to change in timezone

    prathamesh-sonpatki authored claudiob committed
    - Russian time was changed to UTC+3 from UTC+4 recently. This broke the
      string_to_ext test.
Commits on Dec 1, 2014
  1. @spastorino

    Merge pull request #17866 from bogdan/default-form-builder

    spastorino authored
    Bugfix config.action_view.default_form_builder option
Commits on Nov 24, 2014
  1. @rafaelfranca

    Remove some warnings

    rafaelfranca authored
  2. @sgrif @rafaelfranca

    Add array support when time zone aware attributes are enabled

    sgrif authored rafaelfranca committed
    Conflicts:
    	activerecord/test/cases/adapters/postgresql/array_test.rb
Commits on Nov 22, 2014
  1. @sgrif
Commits on Nov 21, 2014
  1. @senny

    make it possible to access fixtures excluded by a `default_scope`.

    senny authored
    Prior to this patch you'd end up with an error like:
    
    ```
    ActiveRecord::RecordNotFound: Couldn't find <Model> with 'id'=<id> [WHERE (<default_scope condition>)]
    ```
    
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Nov 20, 2014
  1. @senny

    `timestamps` and `add_timestamps` pass additional options. Closes #17624

    senny authored
    
    
    Option passing was already supported when using `create_table` but not
    for `change_table`. This patch aligns the method signatures.
Commits on Nov 19, 2014
  1. @rafaelfranca
  2. @rafaelfranca

    Sync CHANGELOG

    rafaelfranca authored
  3. @rafaelfranca

    Merge branch '4-0-11-1' into 4-0-stable

    rafaelfranca authored
    Conflicts:
    	RAILS_VERSION
    	actionmailer/lib/action_mailer/version.rb
    	actionpack/lib/action_pack/version.rb
    	activemodel/lib/active_model/version.rb
    	activerecord/lib/active_record/version.rb
    	activesupport/lib/active_support/version.rb
    	railties/lib/rails/version.rb
    	version.rb
  4. @rafaelfranca
  5. @tenderlove @rafaelfranca

    correctly escape backslashes in request path globs

    tenderlove authored rafaelfranca committed
    make sure that unreadable files are also not leaked
    
    CVE-2014-7829
Commits on Nov 17, 2014
  1. @tenderlove

    Merge branch '4-0-sec' into 4-0-stable

    tenderlove authored
    * 4-0-sec:
      bumping version for relesase
      correctly escape backslashes in request path globs
Commits on Nov 16, 2014
  1. @tenderlove
Something went wrong with that request. Please try again.