Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1579 from bradleybuda/master | José Valim | 2011-06-08 | 1 | -4/+6 |
|\ | | | | | Date#freeze fails when called more than once in 1.8 | ||||
| * | Allow a Date to be frozen more than once without an error in Ruby 1.8.x | Bradley Buda | 2011-06-08 | 1 | -4/+6 |
| | | |||||
* | | Simplify boolean logic into ternary. | Ben Orenstein | 2011-06-08 | 1 | -1/+1 |
|/ | |||||
* | Prefer 'each' over 'for in' syntax. | Sebastian Martinez | 2011-06-07 | 1 | -1/+1 |
| | |||||
* | Ensure that the strings returned by SafeBuffer#gsub and friends aren't ↵ | Michael Koziarski | 2011-06-07 | 1 | -0/+13 |
| | | | | | | | | | | considered html_safe? Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all. Conflicts: activesupport/test/safe_buffer_test.rb | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 1 | -1/+1 |
| | | |||||
* | | avoid creating range objects | Aaron Patterson | 2011-05-29 | 1 | -1/+1 |
| | | |||||
* | | Removed deprecated methods and related tests from ActiveSupport | Josh Kalderimis | 2011-05-25 | 4 | -211/+0 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 5 | -6/+6 |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | Remove extra white spaces on ActiveSupport docs. | Sebastian Martinez | 2011-05-23 | 6 | -7/+7 |
| | | |||||
* | | Removed the AS core_ext/kernel/debugger breakpoint method as this method is ↵ | Josh Kalderimis | 2011-05-23 | 1 | -7/+1 |
| | | | | | | | | added by ruby-debug and should be left as is. Missing tests added. | ||||
* | | Removed AS core_ext/kernel/requires as it's not used and is bad practice. | Josh Kalderimis | 2011-05-23 | 2 | -27/+0 |
| | | |||||
* | | don't raise NoMethodError the tried method doesn't exists | dmathieu | 2011-05-21 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 1 | -0/+2 |
|\ | |||||
| * | Prevent duplicable comments from being the opening paragraph for Object docs | Evan Farrar | 2011-05-18 | 1 | -0/+2 |
| | | |||||
* | | add some missing requires for AS core_ext/numeric/time. Closes #1038 | Josh Kalderimis | 2011-05-18 | 2 | -0/+3 |
| | | |||||
* | | Don't print deprecation warnings every time the user reads or writes an ↵ | Michael Koziarski | 2011-05-17 | 1 | -2/+0 |
| | | | | | | | | inheritable attribute. The warnings on declaration is enough. | ||||
* | | Deprecate attr_accessor_with_default. | José Valim | 2011-05-16 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 11 | -31/+35 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | included examples for negative ordinalize | Vijay Dev | 2011-05-08 | 1 | -4/+7 |
| | | |||||
| * | replaced eg using old router api with the one in the guides. Add info on ↵ | Vijay Dev | 2011-05-07 | 1 | -5/+8 |
| | | | | | | | | nesting with_options | ||||
| * | minor fixes | Vijay Dev | 2011-05-07 | 3 | -4/+3 |
| | | |||||
| * | fixes incorrect error message for sample method | Vijay Dev | 2011-05-07 | 1 | -1/+1 |
| | | |||||
| * | use new AR calls in examples | Vijay Dev | 2011-05-07 | 1 | -2/+2 |
| | | |||||
| * | fix comment alignment | Vijay Dev | 2011-05-07 | 1 | -3/+2 |
| | | |||||
| * | revises comment for blank? method | Vijay Dev | 2011-05-07 | 1 | -3/+3 |
| | | |||||
| * | Revert "Small edit to the if statement simplification for blank? on the ↵ | Xavier Noria | 2011-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object class. An Object doesn't need to be nil and empty to be blank? just one or the other." Reason: the original code is correct, see !nil && !empty -> !(nil || empty) -> !blank That said, this example has too many negations for my linking. Think should be revised to be more positive and straightforward to read. This reverts commit a4b6e3d9be338e93320606f7cb14759b26ced8df. | ||||
| * | Small edit to the if statement simplification for blank? on the Object ↵ | Caley Woods | 2011-05-06 | 1 | -1/+1 |
| | | | | | | | | class. An Object doesn't need to be nil and empty to be blank? just one or the other. | ||||
| * | Fix punctuation errors. | Sebastian Martinez | 2011-05-04 | 1 | -8/+8 |
| | | |||||
* | | new reporting method Kernel#quietly | Xavier Noria | 2011-05-13 | 1 | -1/+13 |
| | | |||||
* | | Remove a circular require in AS deprecations. This is safe as AS ↵ | Josh Kalderimis | 2011-05-12 | 1 | -2/+0 |
| | | | | | | | | deprecations is autoloaded as needed. | ||||
* | | Merge pull request #227 from farski/master | Santiago Pastorino | 2011-05-11 | 2 | -6/+6 |
|\ \ | | | | | | | Unnecessary redundancy in Time/Date calculations | ||||
| * | | Removed some redundant Time#change time options from beginning_of_ methods ↵ | Chris Kalafarski | 2011-03-13 | 2 | -6/+6 |
| | | | | | | | | | | | | in Date and Time | ||||
* | | | Merge pull request #388 from smartinez87/remove_method | José Valim | 2011-05-08 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Better use #remove_possible_method here | ||||
| * | | | Better use #remove_possible_method here | Sebastian Martinez | 2011-05-08 | 1 | -2/+3 |
| | |/ | |/| | |||||
* | | | indifferent access should recurse Hash subclasses | David Lee | 2011-05-08 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes Hash subclasses convert to HWIA by default for nested objects of subclasses of Hash, but allows certain subclasses to prevent nested conversion by introducing Hash#nested_under_indifferent_access that subclasses can overwrite. ActiveSupport::OrderedHash is one such subclass that overwrites +nested_under_indifferent_access+, since implicitly converting it to HWIA would remove the ordering of keys and values in Ruby 1.8. This change is necessary because commit ce9456e broke nested indifferent access conversion for all subclasses of Hash. | ||||
* | | | Revert "Merge pull request #275 from pk-amooma/master" | José Valim | 2011-05-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed. | ||||
* | | | Merge pull request #286 from jasoncodes/marshal_subsec | José Valim | 2011-05-07 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | ||||
| * | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | Jason Weathered | 2011-04-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #275 from pk-amooma/master | José Valim | 2011-05-07 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | properly escape "'" to "'" for XML | ||||
| * | | | | for escaping HTML can be treated as normal XML | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well) | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #349 from bradley178/master | José Valim | 2011-05-07 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Hash.from_xml chokes on empty CDATA | ||||
| * | | | | Fix bug with empty CDATA not being handled in Hash.from_xml | Bradley Harris | 2011-04-29 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Use #remove_possible_method instead | Sebastian Martinez | 2011-05-04 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | fixed a small bug with Array#from core_ext | Josh Kalderimis | 2011-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | using @tenderlove's suggested implementation to speed things up | Jared McFarland | 2011-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixing Array#from to return consistent results | Jared McFarland | 2011-04-26 | 1 | -2/+2 |
| | | | |