Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | 3 | -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.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 2 | -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é Valim | 2012-02-29 | 2 | -17/+49 | |
| | | | ||||||
| | * | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 2 | -12/+0 | |
| | | | ||||||
| | * | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 2 | -0/+15 | |
| | | | ||||||
| * | | 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. | |||||
* / | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 1 | -1/+1 | |
|/ | ||||||
* | 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] | |||||
* | Fixes failing test with ruby 1.8.7-p358 | Arun Agrawal | 2012-02-17 | 1 | -2/+2 | |
| | | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91 | |||||
* | 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 | 2 | -3/+4 | |
| | ||||||
* | Merge pull request #4793 from kennyj/fix_4760 | José Valim | 2012-01-31 | 2 | -2/+11 | |
|\ | | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated. | |||||
| * | Fix GH #4760. A Block was not evaluated. | kennyj | 2012-01-31 | 2 | -2/+11 | |
| | | ||||||
* | | 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 | 2 | -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_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 | |
| | ||||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 1 | -0/+12 | |
| | ||||||
* | safe_constantize should handle wrong constant name NameErrors Fixes #4710 | Alex Tambellini | 2012-01-26 | 2 | -3/+4 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | global variables may not be set depending on the match. fixes #4703 | Aaron Patterson | 2012-01-26 | 2 | -1/+8 | |
| | ||||||
* | Merge pull request #4675 from lunks/3-2-stable | Aaron Patterson | 2012-01-25 | 1 | -1/+1 | |
|\ | | | | | Duping log handler on buffered logger silencer. | |||||
| * | Duping log handler. fixes #4668 | Pedro Nascimento | 2012-01-25 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2 | Vijay Dev | 2012-01-25 | 2 | -8/+8 | |
|\ \ | |/ |/| | Validation guides update 3 2 | |||||
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 2 | -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_offets | Aaron Patterson | 2012-01-24 | 1 | -1/+1 | |
| | | | | | | | | Update time zone offset information | |||||
* | | Fix GH #4344. A defined callback in extended module is called too. | kennyj | 2012-01-24 | 2 | -5/+62 | |
| | | | | | | | | | | | | Conflicts: activesupport/test/callbacks_test.rb | |||||
* | | test base64 encode and decode | Vijay Dev | 2012-01-23 | 1 | -0/+9 | |
| | | ||||||
* | | The deprecated ActiveSupport::Base64.decode64 method should call ↵ | Jonathan Viney | 2012-01-23 | 1 | -1/+1 | |
| | | | | | | | | ::Base64.decode64 not ::Base64.encode64 | |||||
* | | Remove deprecation warning from console output when running | Waseem Ahmad | 2012-01-22 | 1 | -1/+3 | |
| | | | | | | | | activesupport tests. | |||||
* | | Fix GH #4580. Rails 3.2: uninitialized constant ↵ | kennyj | 2012-01-22 | 2 | -1/+5 | |
| | | | | | | | | ActiveSupport::TaggedLogging::ERROR | |||||
* | | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 2 | -2/+2 | |
|/ | ||||||
* | Pass a symbol instead of a block. This is faster and more concise. | Semyon Perepelitsa | 2012-01-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least Ruby 1.8.7 is required which is ok since 3.2. Benchmark: ```ruby require "benchmark" enum = 1..10_000 N = 100 Benchmark.bm do |x| x.report "inject block" do N.times do enum.inject { |sum, n| sum + n } end end x.report "inject symbol" do N.times do enum.inject(:+) end end end ``` Result: ``` user system total real inject block 0.160000 0.000000 0.160000 ( 0.179723) inject symbol 0.090000 0.000000 0.090000 ( 0.095667) ``` | |||||
* | warns against using temporary subscribers | Xavier Noria | 2012-01-12 | 1 | -0/+4 | |
| | ||||||
* | fixes in api docs | Vijay Dev | 2012-01-13 | 2 | -4/+4 | |
| | ||||||
* | Merge pull request #4412 from kennyj/fix_3743 | Santiago Pastorino | 2012-01-11 | 1 | -0/+2 | |
| | | | | Fix GH #3743. We must specify an encoding in rdoc_option explicitly. | |||||
* | Bump to rc2 | Santiago Pastorino | 2012-01-04 | 1 | -1/+1 | |
| | ||||||
* | Revert "AS::Callbacks: remove __define_runner" | José Valim | 2012-01-04 | 1 | -3/+16 | |
| | | | | | | Runners are used internally. This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea. | |||||
* | Merge pull request #4283 from lest/fix-singleton-checking | Aaron Patterson | 2012-01-03 | 1 | -1/+1 | |
| | | | | use correct variant of checking whether class is a singleton | |||||
* | add CHANGELOG entry for AS::Base64 deprecation | Sergey Nartimov | 2012-01-03 | 1 | -2/+4 | |
| | ||||||
* | AS::Callbacks: remove __define_runner | Bogdan Gusiev | 2012-01-03 | 1 | -16/+3 | |
| | ||||||
* | Refactor AS::Callbacks | Bogdan Gusiev | 2012-01-03 | 1 | -6/+8 | |
| | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places |