Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-security' | Aaron Patterson | 2012-03-01 | 1 | -16/+22 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * master-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 Conflicts: actionpack/lib/action_view/helpers/tags/base.rb | ||||
| * | 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 |
| | | |||||
* | | Inflector/constantize - inject method lets us to avoid using another variable | homa | 2012-02-28 | 1 | -5/+3 |
| | | |||||
* | | Merge pull request #4284 from mattdbridges/time_calculation_aliases | Xavier Noria | 2012-02-28 | 2 | -0/+10 |
|\ \ | | | | | | | Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations | ||||
| * | | Adding :last_week, :last_month, and :last_year aliases to Time and Date | Matt Bridges | 2012-02-21 | 2 | -0/+10 |
| | | | | | | | | | | | | core extensions | ||||
* | | | call binmode on the tempfile for Ruby 1.8 compatibility | Aaron Patterson | 2012-02-27 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | Binary mode window bug | ||||
* | | | decouples the implementation of the inflector from its test suite | Xavier Noria | 2012-02-24 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Trying alternative implementations of the inflections is hard because the suite is coupled with the current one, setting ivars by hand etc. This commit relies on initialize_dup, as long as you maintain that one you can tweak the implementation. | ||||
* | | | AS::Callbacks: deprecate rescuable option | Bogdan Gusiev | 2012-02-22 | 1 | -26/+1 |
| | | | |||||
* | | | ordered_options will work if inherited from Hash, remove OrderedHash usage | Vishnu Atrai | 2012-02-21 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #5108 from mirakui/patch-1 | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Bug: cache_key.size doesn't return length of filename but size of file | ||||
| * | | | Bug: cache_path.size doesn't return length of filename but size of file if ↵ | Issei Naruta | 2012-02-21 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | cache_path is Pathname. | ||||
* | | | Merge pull request #5112 from nupurjain/activesupport_cache_refactor | Santiago Pastorino | 2012-02-21 | 1 | -5/+1 |
|\ \ \ | |/ / |/| | | suggested changes. | ||||
| * | | suggested changes. | Nupur Jain | 2012-02-21 | 1 | -5/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update Time#change docs to reflect the options it uses | Eric Oestrich | 2012-02-17 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-14 | 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` | ||||
* | | | | remove unnecessary require core_ext/string/encoding | Sergey Nartimov | 2012-02-14 | 5 | -5/+0 |
| | | | | |||||
* | | | | prefer tr to gsub for replacing characters | Xavier Noria | 2012-02-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | inflection regexp are meant to be applied once | Xavier Noria | 2012-02-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | removes redundant argument | Xavier Noria | 2012-02-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | boosts inflections | Xavier Noria | 2012-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The impact of this change has been measured pluralizing the entire /usr/share/dict/words, showing a 6x speedup | ||||
* | | | | say unshift when you mean unshift (modulus prepend) | Xavier Noria | 2012-02-11 | 1 | -3/+5 |
| | | | | |||||
* | | | | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵ | Xavier Noria | 2012-02-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | regression uncovered | ||||
* | | | | Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ss | Xavier Noria | 2012-02-10 | 1 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases | ||||
| * | | | | Add Inflection test (and fixes) to ensure singularizing a singular actually ↵ | Mark McSpadden | 2012-01-27 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | give you the correct singular in more cases | ||||
* | | | | | Merge pull request #4985 from shigeya/range_overlaps_to_use_cover | Aaron Patterson | 2012-02-10 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | make Range#overlaps? accept Range of Time | ||||
| * | | | | make Range#overlaps? accept Range of Time | Shigeya Suzuki | 2012-02-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Replaced OrderedHash usage with Ruby 1.9 Hash | Uddhava | 2012-02-09 | 1 | -3/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4878 from vijaydev/ordinal-2072 | Xavier Noria | 2012-02-07 | 2 | -10/+38 |
|\ \ \ \ | |_|/ / |/| | | | PR #2072 with docs | ||||
| * | | | Add ActiveSupport::Inflector.ordinal and Integer#ordinal | Tim Gildea | 2012-02-04 | 2 | -10/+38 |
| | | | | |||||
* | | | | Optional start_day argument for Time#all_week. | kennyj | 2012-02-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Closes #4883 | ||||
* | | | | AS::Callbacks: remove unused code | Bogdan Gusiev | 2012-02-05 | 1 | -17/+13 |
|/ / / | |||||
* | | | AS::Callbacks: rip out per_key option. | Bogdan Gusiev | 2012-02-04 | 1 | -34/+13 |
| | | | |||||
* | | | Merge pull request #4866 from bogdan/terminate_after_callbacks | José Valim | 2012-02-04 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option | ||||
| * | | | AS::Callbacks: :skip_after_callbacks_if_terminated option | Bogdan Gusiev | 2012-02-03 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #4865 from bogdan/deprecate_per_key | José Valim | 2012-02-03 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | AC::Callbacks: remove usage of :per_key option from filters | ||||
| * | | | | AC::Callbacks: remove usage of :per_key option from filters | Bogdan Gusiev | 2012-02-03 | 1 | -2/+2 |
| |/ / / | |||||
* / / / | Update Unicode database to recently-released 6.1. | Norman Clarke | 2012-02-03 | 2 | -1/+1 |
|/ / / | | | | | | | | | | http://www.geek.com/articles/geek-pick/unicode-6-1-released-complete-with-emoji-characters-and-a-pile-of-poo-2012022/ | ||||
* | | | Merge pull request #4784 from semaperepelitsa/constantize | Aaron Patterson | 2012-02-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | A little constantize update | ||||
| * | | | There is an "inherit" option on const_get too, why not use it? | Semyon Perepelitsa | 2012-01-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | revise docs [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | [ci skip] More docs for ActiveSupport::MessageEncryptor | Daniel Fone | 2012-01-26 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Build fix when running isolated test | Arun Agrawal | 2012-02-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Move escaping regexps to constants | Carlos Antonio da Silva | 2012-02-01 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Move escape_once logic to ERB::Util, where it belongs to | Carlos Antonio da Silva | 2012-02-01 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it. | ||||
* | | | | | Added as_json method for multibyte strings | Dmitriy Vorotilin | 2012-02-01 | 1 | -0/+4 |
| |/ / / |/| | | |