aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-312-2/+2
|\ | | | | | | | | | | | | | | * 3-2-rel: bumping to 3.2.4 adding security notifications to CHANGELOGs updating changelogs Merge pull request #6558 from parndt/fix_regression
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
| |
| * updating changelogsAaron Patterson2012-05-311-1/+1
| |
* | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-311-2/+2
|\| | | | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this bumping to 3.2.4.rc1
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
| |
* | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-303-4/+20
| |
* | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-302-6/+12
| | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
* | Exceptions like Interrupt should not be rescued in tests.James Mead2012-05-292-2/+47
|/ | | | | This is a back-port of rails/rails#6525. See the commit notes there for details.
* Improve docs for `try` by adding note on `BasicObject`Piotr Sarnacki2012-05-201-0/+4
| | | | [ci skip] closes #5790
* Backporting some docs on core_ext/hashFrancesco Rodriguez2012-05-153-4/+23
|
* adding examples and docsFrancesco Rodriguez2012-05-123-1/+22
|
* Update performance profiler to work with latest ruby-profArun Agrawal2012-05-111-1/+1
| | | | Thanks to @carlosantoniodasilva
* Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵Mark J. Titorenko2012-05-091-0/+6
| | | | #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
* Bring activesupport CHANGELOG up-to-date/consistent with master.Mark J. Titorenko2012-05-091-1/+59
|
* fix attribute_accessors docs to support 1.8 syntaxFrancesco Rodriguez2012-05-091-11/+11
|
* removing docs duplicationFrancesco Rodriguez2012-05-081-23/+0
|
* Merge pull request #6211 from frodsan/docs_attr_accessor_32stableVijay Dev2012-05-081-0/+111
|\ | | | | Adding docs to attribute accessor methods.
| * added docs to attribute_accessors methodsFrancesco Rodriguez2012-05-081-0/+111
| |
* | added beginning_of_hour support to core_ext calculations for Time and DateTimeMark J. Titorenko2012-05-045-0/+56
|/
* Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.Dave Gerton2012-04-301-2/+4
| | | | | | | | | Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22)
* Add release data to Rails 3.2.3Rafael Mendonça França2012-04-301-1/+1
|
* Remove circular require of time/zonesOscar Del Ben2012-04-291-1/+0
|
* 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`
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 01:22:24 +0000