| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch '3-2-stable-sec' into 3-2-stable | Aaron Patterson | 2012-05-31 | 1 | -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.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 | |
| | | | ||||||
| * | | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-05-30 | 1 | -1/+9 | |
| | | | ||||||
| * | | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-30 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb | |||||
| * | | Exceptions like Interrupt should not be rescued in tests. | James Mead | 2012-05-29 | 1 | -0/+5 | |
| |/ | | | | | 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 Sarnacki | 2012-05-20 | 1 | -0/+4 | |
| | | | | | [ci skip] closes #5790 | |||||
| * | Backporting some docs on core_ext/hash | Francesco Rodriguez | 2012-05-15 | 3 | -4/+23 | |
| | | ||||||
| * | adding examples and docs | Francesco Rodriguez | 2012-05-12 | 3 | -1/+22 | |
| | | ||||||
| * | Update performance profiler to work with latest ruby-prof | Arun Agrawal | 2012-05-11 | 1 | -1/+1 | |
| | | | | | Thanks to @carlosantoniodasilva | |||||
| * | fix attribute_accessors docs to support 1.8 syntax | Francesco Rodriguez | 2012-05-09 | 1 | -11/+11 | |
| | | ||||||
| * | removing docs duplication | Francesco Rodriguez | 2012-05-08 | 1 | -23/+0 | |
| | | ||||||
| * | Merge pull request #6211 from frodsan/docs_attr_accessor_32stable | Vijay Dev | 2012-05-08 | 1 | -0/+111 | |
| |\ | | | | | Adding docs to attribute accessor methods. | |||||
| | * | added docs to attribute_accessors methods | Francesco Rodriguez | 2012-05-08 | 1 | -0/+111 | |
| | | | ||||||
| * | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 2 | -0/+26 | |
| |/ | ||||||
| * | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. | Dave Gerton | 2012-04-30 | 1 | -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) | |||||
| * | Remove circular require of time/zones | Oscar Del Ben | 2012-04-29 | 1 | -1/+0 | |
| | | ||||||
| * | Use `Object#respond_to?` to determine which MultiJson API to use | Erik Michaels-Ober | 2012-04-18 | 1 | -3/+17 | |
| | | ||||||
| * | Add missing require in Active Support time zones (fixes #5854) | Piotr Sarnacki | 2012-04-15 | 1 | -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 Patterson | 2012-04-10 | 1 | -0/+1 | |
| | | ||||||
| * | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-04-10 | 1 | -0/+12 | |
| | | | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb | |||||
| * | Merge pull request #5188 from jlxw/patch-1 | Santiago Pastorino | 2012-04-04 | 1 | -1/+1 | |
| | | | | | logger.silence is deprecated | |||||
| * | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 | |
| | | ||||||
| * | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 | |
| | | ||||||
| * | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 | |
| | | ||||||
| * | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-17 | 1 | -6/+6 | |
| | | ||||||
| * | Stop SafeBuffer#clone_empty from issuing warnings | Carlos Antonio da Silva | 2012-03-02 | 1 | -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-stable | Aaron Patterson | 2012-03-01 | 2 | -17/+23 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 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.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 1 | -16/+22 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 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é Valim | 2012-02-29 | 1 | -12/+18 | |
| | | | | ||||||
| | | * | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 1 | -6/+0 | |
| | | | | ||||||
| | | * | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 | |
| | |/ | ||||||
| * | | call binmode on the tempfile for Ruby 1.8 compatibility | Aaron Patterson | 2012-02-27 | 1 | -1/+2 | |
| | | | ||||||
| * | | Fixing Windows asset tag helper test failure | Ralph Shnelvar | 2012-02-25 | 1 | -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. | |||||
| * | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-20 | 1 | -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 uses | Eric Oestrich | 2012-02-18 | 1 | -1/+1 | |
| | | | | | [ci skip] | |||||
| * | Fix deprecation warning in AS::Concern. | José Valim | 2012-02-13 | 1 | -1/+1 | |
| | | ||||||
| * | GH #4883. Optional start_day argument for Time#all_week | kennyj | 2012-02-05 | 1 | -3/+3 | |
| | | ||||||
| * | Merge pull request #4793 from kennyj/fix_4760 | José Valim | 2012-01-31 | 1 | -2/+3 | |
| |\ | | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated. | |||||
| | * | Fix GH #4760. A Block was not evaluated. | kennyj | 2012-01-31 | 1 | -2/+3 | |
| | | | ||||||
| * | | Fix use of Deprecation without requiring active_support/deprecation in whiny nil | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
| | | | ||||||
| * | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+1 | |
| | | | | | | | | | message verifier | |||||
| * | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
| | | | | | | | | | ActiveSupport::Concern in Base64 | |||||
| * | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
| |/ | | | | ActiveSupport::Concern | |||||
| * | fix typo [ci skip] | Vijay Dev | 2012-01-30 | 1 | -1/+1 | |
| | | ||||||
| * | Inline the prefix assignment so it doesnt look so daft | David Heinemeier Hansson | 2012-01-27 | 1 | -2/+1 | |
| | | ||||||
| * | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 1 | -1/+1 | |
| | | | | | | | 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_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 | |
| | | ||||||
| * | safe_constantize should handle wrong constant name NameErrors Fixes #4710 | Alex Tambellini | 2012-01-26 | 1 | -1/+1 | |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |