aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|
* Use `Object#respond_to?` to determine which MultiJson API to useErik Michaels-Ober2012-04-181-3/+17
|
* Revert "multi_json is restricted to < 1.3 "Erik Michaels-Ober2012-04-181-1/+1
| | | | This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b.
* Merge pull request #5861 from arunagw/multi_json_fix_3-2-stableJeremy Kemper2012-04-161-1/+1
|\ | | | | Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
| * multi_json is restricted to < 1.3 Arun Agrawal2012-04-161-1/+1
| | | | | | | | Some API changes are there above 1.3. 3-2-stable
* | Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-0/+1
|/ | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* probably should require the objects we monkey patch.Aaron Patterson2012-04-101-0/+1
|
* bigdecimal can be duped on Ruby 2.0Aaron Patterson2012-04-102-2/+22
| | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb
* add the class name to the assertion messageAaron Patterson2012-04-101-1/+1
|
* Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
| | | | logger.silence is deprecated
* Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
|
* Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
|
* Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
|
* Ensure load hooks can be called more than once with different contexts.José Valim2012-03-172-6/+35
|
* Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-0/+1
| | | | Also add missing entries and use the formating convention
* update changelogs for gems without changes too [ci skip]Vijay Dev2012-03-091-0/+8
|
* Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
| | | | | | | | | | | | Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1 This was issuing a "not initialized variable" warning - related to: https://github.com/rails/rails/pull/5237 The logic applied by this method is already handled by the [] override, so there is no need to reset the variable here.
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-013-26/+61
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| |
| * Merge branch '3-2-stable-security' into 3-2-2Aaron Patterson2012-03-012-25/+60
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| | * Ensure [] respects the status of the buffer.José Valim2012-02-292-17/+49
| | |
| | * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| | |
| | * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| | |
| * | updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
| | |
* | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
| | |
* | | Fixing Windows asset tag helper test failureRalph Shnelvar2012-02-251-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | In asset_tag_helper_test.rb there is an assert on the number of bytes in a concatenated file. This test failed because Windows converts \n to \r\n as the default for "w". This is different than in *nix systems where there is no conversion done. THe test that failed was test_caching_stylesheet_link_tag_when_caching_on Using bin mode fixes this behavior on windows and makes no change on the *nix systems.
* / Fix some warnings on 3-2-stablekennyj2012-02-211-1/+1
|/
* sync __run_callbacks with ruby-trunkSokolov Yura2012-02-201-1/+1
| | | | | | https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true`
* Update Time#change docs to reflect the options it usesEric Oestrich2012-02-181-1/+1
| | | | [ci skip]
* Fixes failing test with ruby 1.8.7-p358Arun Agrawal2012-02-171-2/+2
| | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91
* Fix deprecation warning in AS::Concern.José Valim2012-02-131-1/+1
|
* GH #4883. Optional start_day argument for Time#all_weekkennyj2012-02-052-3/+4
|
* Merge pull request #4793 from kennyj/fix_4760José Valim2012-01-312-2/+11
|\ | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated.
| * Fix GH #4760. A Block was not evaluated.kennyj2012-01-312-2/+11
| |
* | Fix use of Deprecation without requiring active_support/deprecation in whiny nilMarten Veldthuis2012-01-311-0/+2
| |
* | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+1
| | | | | | | | message verifier
* | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
| | | | | | | | ActiveSupport::Concern in Base64
* | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
|/ | | | ActiveSupport::Concern
* fix typo [ci skip]Vijay Dev2012-01-301-1/+1
|
* Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
|
* Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
| | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-261-0/+12
|
* safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* global variables may not be set depending on the match. fixes #4703Aaron Patterson2012-01-262-1/+8
|
* Merge pull request #4675 from lunks/3-2-stableAaron Patterson2012-01-251-1/+1
|\ | | | | Duping log handler on buffered logger silencer.
| * Duping log handler. fixes #4668Pedro Nascimento2012-01-251-1/+1
| |
* | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-252-8/+8
|\ \ | |/ |/| Validation guides update 3 2
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-252-8/+8
| | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
* | Merge pull request #4514 from brainopia/update_timezone_offetsAaron Patterson2012-01-241-1/+1
| | | | | | | | Update time zone offset information