Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |||||
* | adds a comments that clarifies why Range#include? chooses the comparison ↵ | Xavier Noria | 2011-12-30 | 1 | -0/+1 | |
| | | | | operator | |||||
* | refactor Range#include? to handle ranges with floats | Sergey Nartimov | 2011-12-30 | 1 | -3/+2 | |
| | | | | | | Conflicts: activesupport/lib/active_support/core_ext/range/include_range.rb | |||||
* | Revert "Further simplify singleton_class checking in class_attribute" | Jon Leighton | 2011-12-28 | 1 | -1/+14 | |
| | | | | | | This reverts commit 520918aad9b84eee807eb42fcb32f57c152d50e0. Reason: build failure | |||||
* | Further simplify singleton_class checking in class_attribute | James Miller | 2011-12-28 | 1 | -14/+1 | |
| | ||||||
* | delegating and deprecating logger#silence. fixes #4159 | Aaron Patterson | 2011-12-24 | 1 | -0/+2 | |
| | ||||||
* | Revert "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 1 | -7/+0 | |
| | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. | |||||
* | Remove duplicate html_escape docs | Jeremy Kemper | 2011-12-11 | 1 | -10/+1 | |
| | ||||||
* | Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings | Jeremy Kemper | 2011-12-11 | 1 | -15/+36 | |
| | | | | | | | | | | | | length user system total real before 6 0.010000 0.000000 0.010000 ( 0.012378) after 6 0.010000 0.000000 0.010000 ( 0.012866) before 60 0.040000 0.000000 0.040000 ( 0.046273) after 60 0.040000 0.000000 0.040000 ( 0.036421) before 600 0.390000 0.000000 0.390000 ( 0.390670) after 600 0.210000 0.000000 0.210000 ( 0.209094) before 6000 3.750000 0.000000 3.750000 ( 3.751008) after 6000 1.860000 0.000000 1.860000 ( 1.857901) | |||||
* | fix nodocs | Vijay Dev | 2011-12-09 | 1 | -1/+1 | |
| | ||||||
* | Restore performance of ERB::Util.html_escape | Jon Jensen | 2011-12-03 | 1 | -1/+1 | |
| | | | | | | | Revert html_escape to do a single gsub again, but add the "n" flag (no language, i.e. not multi-byte) to protect against XSS via invalid utf8 Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH* | David Heinemeier Hansson | 2011-12-02 | 1 | -0/+7 | |
| | ||||||
* | Module#synchronize is deprecated with no replacement. Please use `monitor` ↵ | Aaron Patterson | 2011-11-29 | 1 | -0/+2 | |
| | | | | from ruby's standard library. | |||||
* | Merge pull request #3767 from tadast/object_in | Yehuda Katz | 2011-11-26 | 1 | -7/+17 | |
|\ | | | | | Object#in? also accepts multiple parameters | |||||
| * | Object#in? also accepts multiple parameters | Tadas Tamošauskas | 2011-11-26 | 1 | -7/+17 | |
| | | ||||||
* | | Adds Time#sunday method | Vijay Dev | 2011-11-26 | 1 | -0/+6 | |
| | | ||||||
* | | Convert aliases monday and sunday to methods | Vijay Dev | 2011-11-26 | 2 | -3/+18 | |
| | | | | | | | | | | | | | | | | A recent change to beginning_of_week and end_of_week added an argument that can be used to specify the week's starting day as a symbol. Now these methods were aliased as monday and sunday respectively which as a consequence of the argument addition, made calls like obj.monday(:sunday) possible. This commit makes them methods on their own. | |||||
* | | minor doc changes | Vijay Dev | 2011-11-26 | 1 | -3/+3 | |
| | | ||||||
* | | some tweaks to PR#3547. [Closes #3547] | Xavier Noria | 2011-11-25 | 1 | -7/+12 | |
| | | ||||||
* | | API docstrings updated with default value info | gregolsen | 2011-11-25 | 2 | -6/+6 | |
| | | ||||||
* | | beginning_of_week extended in both Time and Date so that to return week ↵ | gregolsen | 2011-11-25 | 2 | -16/+32 | |
| | | | | | | | | start based on start day that is monday by default | |||||
* | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 6 | -11/+112 | |
|\ \ | ||||||
| * \ | Merge pull request #3725 from marcandre/twz_eql | Yehuda Katz | 2011-11-22 | 1 | -0/+10 | |
| |\ \ | | |/ | |/| | Fix inconsistencies with Time{WithZone}#{hash,eql?} | |||||
| | * | Fix inconsistencies with Time{WithZone}#{hash,eql?} | Marc-Andre Lafortune | 2011-11-22 | 1 | -0/+10 | |
| | | | ||||||
| * | | updating API docstring so that user can infer default value | gregolsen | 2011-11-17 | 2 | -4/+4 | |
| |/ | ||||||
| * | fixes a typo (thanks to Alexey Vakhov) | Xavier Noria | 2011-10-30 | 1 | -1/+1 | |
| | | ||||||
| * | defines Module#qualified_const_(defined?|get|set) and String#deconstantize | Xavier Noria | 2011-10-29 | 3 | -1/+81 | |
| | | | | | | | | | | | | | | | | | | | | This commit also implements a faster version of #demodulize I was unable to isolate with git add --patch. Not a big fan of the name #deconstantize. It complements #demodulize getting rid of the rightmost constant, hence the name, but it is unrelated to the well-known #constantize. So unsure. Could not come with anything better, please feel free to rename. | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-20 | 1 | -3/+3 | |
| |\ | ||||||
| | * | Fixed misleading docs for String#to_formatted_s(:db) | Martin Svalin | 2011-10-20 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge pull request #3151 from zenprogrammer/pluralize_without_count | José Valim | 2011-10-17 | 1 | -3/+14 | |
| |\ \ | | |/ | |/| | Added include_count parameter to pluralize. | |||||
| | * | Modified String#pluralize to take an optional count parameter. | Ryan Oblak | 2011-09-28 | 1 | -3/+14 | |
| | | | ||||||
* | | | Don't unnecessarily use String eval. | Jose and Yehuda | 2011-10-15 | 1 | -2/+2 | |
|/ / | ||||||
* | | Revert "don't raise NoMethodError the tried method doesn't exists" | José Valim | 2011-10-06 | 1 | -2/+0 | |
| | | | | | | | | This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6. | |||||
* | | ruby193: String#prepend is also unsafe | Akira Matsuda | 2011-10-05 | 1 | -1/+1 | |
| | | ||||||
* | | override unsafe methods only if defined on String | Akira Matsuda | 2011-10-05 | 1 | -10/+12 | |
| | | ||||||
* | | to_formatted_s is an instance method for a Range not an Array | Ayrton De Craene | 2011-10-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #2801 from jeremyevans/patch-1 | Jeremy Kemper | 2011-10-03 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix obviously breakage of Time.=== for Time subclasses | |||||
| * | | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHub | Jeremy Evans | 2011-09-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Set the default options value for as_json in the encoder object. | José Valim | 2011-09-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fixing `as_json` method for ActiveRecord models. | Nicolás Hock Isaza | 2011-09-29 | 1 | -1/+1 | |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case. | |||||
* | | remove superfluous to_s in ERB::Util.html_escape | Alexey Vakhov | 2011-09-24 | 1 | -1/+1 | |
| | | ||||||
* | | Minor doc fix to String#constantize | Ryan Oblak | 2011-09-23 | 1 | -3/+3 | |
| | | ||||||
* | | Use safe_constantize where possible. | José Valim | 2011-09-23 | 1 | -3/+1 | |
| | | ||||||
* | | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵ | Ryan Oblak | 2011-09-23 | 1 | -3/+16 | |
| | | | | | | | | refactored common constantize tests into ConstantizeTestCases | |||||
* | | fix incorrect comment | Vijay Dev | 2011-09-22 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #3049 from brainopia/fix_to_query_edge_case | Santiago Pastorino | 2011-09-17 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby | |||||
| * | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby | brainopia | 2011-09-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Proper lines numbers for stack trace info | Santiago Pastorino | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | revert the changes from c60995f3 - related to marking sub,gsub as ↵ | Vijay Dev | 2011-09-09 | 1 | -20/+1 | |
| | | | | | | | | unavailable to use with safe strings | |||||
* | | Revert removing gsub and sub from safe buffer. | José Valim | 2011-09-08 | 1 | -3/+3 | |
| | |