Permalink
Switch branches/tags
Commits on Apr 20, 2015
  1. Merge pull request #19828 from JuanitoFatas/patch-2

    Arthur Nogueira Neves
    Arthur Nogueira Neves committed Apr 20, 2015
    [ci skip] Fix broken strict option link in MySQL adapter (4-0-stable)
Commits on Jan 6, 2015
  1. Do no unescaped already unescaped bytea values

    rafaelfranca committed Jan 6, 2015
    If the unescaped value contains a null byte, pg 0.18 will raise an
    exception.
Commits on Jan 2, 2015
  1. Check by @v before converting the entry on expired?

    rafaelfranca committed Dec 29, 2014
    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.
Commits on Dec 29, 2014
  1. Fix type [ci skip] 💣

    rafaelfranca committed Dec 29, 2014
  2. Merge pull request #11085 from acapilleri/partial_exception_message

    rafaelfranca committed Dec 29, 2014
    fix identifier error message of partial with unvalid charter
    
    Conflicts:
    	actionview/CHANGELOG.md
    
    Conflicts:
    	actionview/CHANGELOG.md
  3. As of Unicode 6.3, Mongolian Vowel Separator is not whitespace

    matthewd authored and rafaelfranca committed Sep 15, 2014
    Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's
    not a good candidate for testing String#squish.
  4. i18n.enforce_available_locales overrides the I18n configuration

    rafaelfranca committed Dec 29, 2014
    This will make Rails work with i18n 0.6 and 0.7.
  5. Merge pull request #18236 from vipulnsward/dont-eval-frozen

    rafaelfranca committed Dec 29, 2014
    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
  6. Test with Ruby 2.2

    rafaelfranca committed Dec 29, 2014
Commits on Dec 12, 2014
  1. Merge pull request #17186 from tgxworld/header_authentication_token

    matthewd committed Nov 26, 2014
    Allow authentication header to not have to specify 'token=' key.
    
    Conflicts:
    	actionpack/CHANGELOG.md
  2. Merge pull request #16011 from xjlu/token_and_options

    rafaelfranca authored and matthewd committed Jul 4, 2014
    Improve token_and_options regex and test
Commits on Dec 9, 2014
  1. Don't rely on `Time.current` is tests

    rafaelfranca committed Dec 9, 2014
    Millisecond inequality causes failures on Travis
  2. Merge pull request #17975 from merongivian/add_test_for_search_field

    rafaelfranca committed Dec 9, 2014
    Fix options overwritten by super
    Conflicts:
    	actionpack/lib/action_view/helpers/tags/text_field.rb
Commits on Dec 2, 2014
  1. Merge pull request #17876 from claudiob/fix-tests-on-4-0-stable

    senny committed Dec 2, 2014
    Fix tests on 4-0-stable
  2. Fix broken string_ext_test due to change in timezone

    prathamesh-sonpatki authored and claudiob committed Nov 5, 2014
    - Russian time was changed to UTC+3 from UTC+4 recently. This broke the
      string_to_ext test.
Commits on Dec 1, 2014
  1. Merge pull request #17866 from bogdan/default-form-builder

    spastorino committed Dec 1, 2014
    Bugfix config.action_view.default_form_builder option
Commits on Nov 24, 2014
  1. Remove some warnings

    rafaelfranca committed Nov 24, 2014
  2. Add array support when time zone aware attributes are enabled

    sgrif authored and rafaelfranca committed Jun 7, 2014
    Conflicts:
    	activerecord/test/cases/adapters/postgresql/array_test.rb
Commits on Nov 22, 2014
  1. Rename the primary key index when renaming a table in pg

    sgrif committed Nov 22, 2014
    Backport of dcc143c
    
    Fixes #12856
    Closes #14088
Commits on Nov 21, 2014
  1. make it possible to access fixtures excluded by a `default_scope`.

    senny committed Nov 21, 2014
    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. `timestamps` and `add_timestamps` pass additional options. Closes #17624

    senny committed Nov 20, 2014
    
    
    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. Sync CHANGELOG

    rafaelfranca committed Nov 19, 2014
  2. Merge branch '4-0-11-1' into 4-0-stable

    rafaelfranca committed Nov 19, 2014
    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
  3. correctly escape backslashes in request path globs

    tenderlove authored and rafaelfranca committed Nov 5, 2014
    make sure that unreadable files are also not leaked
    
    CVE-2014-7829
Commits on Nov 17, 2014
  1. Merge branch '4-0-sec' into 4-0-stable

    tenderlove committed Nov 17, 2014
    * 4-0-sec:
      bumping version for relesase
      correctly escape backslashes in request path globs
Commits on Nov 16, 2014