aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5287 from nashby/hash-slice-extractAaron Patterson2012-03-081-8/+4
|\ | | | | refactor Hash#slice and Hash#extract!
| * refactor Hash#slice and Hash#extract!Vasiliy Ermolovich2012-03-061-8/+4
| |
* | Ensure load hooks can be called more than once with different contexts.José Valim2012-03-061-6/+6
| |
* | Clean up module docs [ci skip]Vijay Dev2012-03-079-52/+45
|/ | | | Removed some useless docstrings and no-doc'ed some.
* 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 'master-security'Aaron Patterson2012-03-011-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é Valim2012-02-291-12/+18
| |
| * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-201-6/+0
| |
| * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-201-0/+6
| |
* | Inflector/constantize - inject method lets us to avoid using another variablehoma2012-02-281-5/+3
| |
* | Merge pull request #4284 from mattdbridges/time_calculation_aliasesXavier Noria2012-02-282-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 DateMatt Bridges2012-02-212-0/+10
| | | | | | | | | | | | core extensions
* | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
| | |
* | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bugAaron Patterson2012-02-271-1/+1
| | | | | | | | | | | | Binary mode window bug
* | | decouples the implementation of the inflector from its test suiteXavier Noria2012-02-241-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 optionBogdan Gusiev2012-02-221-26/+1
| | |
* | | ordered_options will work if inherited from Hash, remove OrderedHash usageVishnu Atrai2012-02-211-3/+1
| | |
* | | Merge pull request #5108 from mirakui/patch-1Aaron Patterson2012-02-211-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 Naruta2012-02-211-1/+1
| | |/ | |/| | | | | | | cache_path is Pathname.
* | | Merge pull request #5112 from nupurjain/activesupport_cache_refactorSantiago Pastorino2012-02-211-5/+1
|\ \ \ | |/ / |/| | suggested changes.
| * | suggested changes.Nupur Jain2012-02-211-5/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-181-1/+1
|\ \ \
| * | | Update Time#change docs to reflect the options it usesEric Oestrich2012-02-171-1/+1
| | | | | | | | | | | | [ci skip]
* | | | sync __run_callbacks with ruby-trunkSokolov Yura2012-02-141-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/encodingSergey Nartimov2012-02-145-5/+0
| | | |
* | | | prefer tr to gsub for replacing charactersXavier Noria2012-02-121-2/+2
| | | |
* | | | inflection regexp are meant to be applied onceXavier Noria2012-02-121-2/+2
| | | |
* | | | removes redundant argumentXavier Noria2012-02-121-1/+1
| | | |
* | | | boosts inflectionsXavier Noria2012-02-121-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 Noria2012-02-111-3/+5
| | | |
* | | | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵Xavier Noria2012-02-101-2/+3
| | | | | | | | | | | | | | | | regression uncovered
* | | | Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ssXavier Noria2012-02-101-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 McSpadden2012-01-271-6/+7
| | | | | | | | | | | | | | | | | | | | give you the correct singular in more cases
* | | | | Merge pull request #4985 from shigeya/range_overlaps_to_use_coverAaron Patterson2012-02-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | make Range#overlaps? accept Range of Time
| * | | | make Range#overlaps? accept Range of TimeShigeya Suzuki2012-02-091-1/+1
| | | | |
* | | | | Replaced OrderedHash usage with Ruby 1.9 HashUddhava2012-02-091-3/+1
|/ / / /
* | | | Merge pull request #4878 from vijaydev/ordinal-2072Xavier Noria2012-02-072-10/+38
|\ \ \ \ | |_|/ / |/| | | PR #2072 with docs
| * | | Add ActiveSupport::Inflector.ordinal and Integer#ordinalTim Gildea2012-02-042-10/+38
| | | |
* | | | Optional start_day argument for Time#all_week.kennyj2012-02-061-3/+3
| | | | | | | | | | | | | | | | Closes #4883
* | | | AS::Callbacks: remove unused codeBogdan Gusiev2012-02-051-17/+13
|/ / /
* | | AS::Callbacks: rip out per_key option.Bogdan Gusiev2012-02-041-34/+13
| | |
* | | Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-041-1/+6
|\ \ \ | | | | | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
| * | | AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-031-1/+6
| | | |
* | | | Merge pull request #4865 from bogdan/deprecate_per_keyJosé Valim2012-02-031-2/+2
|\ \ \ \ | | | | | | | | | | AC::Callbacks: remove usage of :per_key option from filters
| * | | | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-031-2/+2
| |/ / /
* / / / Update Unicode database to recently-released 6.1.Norman Clarke2012-02-032-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/constantizeAaron Patterson2012-02-011-1/+1
|\ \ \ | | | | | | | | A little constantize update
| * | | There is an "inherit" option on const_get too, why not use it?Semyon Perepelitsa2012-01-311-1/+1
| | | |
* | | | revise docs [ci skip]Vijay Dev2012-02-011-1/+1
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-011-0/+14
|\ \ \ \