aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1411-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 docsSebastian Martinez2011-05-101-1/+1
| |
| * included examples for negative ordinalizeVijay Dev2011-05-081-4/+7
| |
| * replaced eg using old router api with the one in the guides. Add info on ↵Vijay Dev2011-05-071-5/+8
| | | | | | | | nesting with_options
| * minor fixesVijay Dev2011-05-073-4/+3
| |
| * fixes incorrect error message for sample methodVijay Dev2011-05-071-1/+1
| |
| * use new AR calls in examplesVijay Dev2011-05-071-2/+2
| |
| * fix comment alignmentVijay Dev2011-05-071-3/+2
| |
| * revises comment for blank? methodVijay Dev2011-05-071-3/+3
| |
| * Revert "Small edit to the if statement simplification for blank? on the ↵Xavier Noria2011-05-061-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 Woods2011-05-061-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 Martinez2011-05-041-8/+8
| |
* | securerandom ships with 1.8.7+, so just use itAaron Patterson2011-05-131-202/+3
| |
* | new reporting method Kernel#quietlyXavier Noria2011-05-132-1/+15
| |
* | Remove a circular require in AS deprecations. This is safe as AS ↵Josh Kalderimis2011-05-121-2/+0
| | | | | | | | deprecations is autoloaded as needed.
* | Merge pull request #227 from farski/masterSantiago Pastorino2011-05-112-6/+6
|\ \ | | | | | | Unnecessary redundancy in Time/Date calculations
| * | Removed some redundant Time#change time options from beginning_of_ methods ↵Chris Kalafarski2011-03-132-6/+6
| | | | | | | | | | | | in Date and Time
* | | Add missing requiresSantiago Pastorino2011-05-111-0/+1
| | |
* | | Merge pull request #515 from joshk/patch-3José Valim2011-05-111-0/+2
|\ \ \ | | | | | | | | updated the ActiveSupport changelog
| * | | updated the ActiveSupport changelogJosh Kalderimis2011-05-111-0/+2
| | | |
* | | | add missing require for ordered_hash dependencyCorin Langosch2011-05-111-0/+1
|/ / /
* | | make sure log file is written in binary mode. fixes #497Aaron Patterson2011-05-102-0/+41
| | |
* | | Merge pull request #490 from vijaydev/patch-4Piotr Sarnacki2011-05-101-1/+1
|\ \ \ | | | | | | | | Replace LH with GitHub url for filing issues
| * | | Replace LH with GitHub url for filing issuesVijay Dev2011-05-101-1/+1
| | | |
* | | | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-101-0/+28
|/ / /
* | | Update copyright year in Active Resource and Active SupportVijay Dev2011-05-091-1/+1
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Fix failing test.José Valim2011-05-091-1/+1
| | |
* | | xml_mini.rb:_dasherize() replacement 20 to 25% fasterMike Howard2011-05-091-4/+3
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Just a minor fix in A.S CHANGELOGGuillermo Iguaran2011-05-081-1/+1
| | |
* | | adds code examples for negative ordinalizeVijay Dev2011-05-081-1/+3
| | |
* | | Merge pull request #445 from prakashmurthy/lighthouse_6334Aaron Patterson2011-05-081-0/+10
|\ \ \ | | | | | | | | Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time
| * | | Lighthouse ticket # 6334; added tests to verify that spaces in key are ↵prakashmurthy2011-05-081-0/+10
| | | | | | | | | | | | | | | | dasherized.
* | | | Merge pull request #388 from smartinez87/remove_methodJosé Valim2011-05-081-2/+3
|\ \ \ \ | |/ / / |/| | | Better use #remove_possible_method here
| * | | Better use #remove_possible_method hereSebastian Martinez2011-05-081-2/+3
| | |/ | |/|
* | | indifferent access should recurse Hash subclassesDavid Lee2011-05-085-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #430 from dlee/methodoverrideJosé Valim2011-05-081-0/+1
|\ \ \ | | | | | | | | Logs should show overridden method; Issue 426
| * | | Logs should show overridden method; Issue 426David Lee2011-05-071-0/+1
| | | |
* | | | Fix failing xml mini test.José Valim2011-05-081-1/+4
| | | |
* | | | Rename duplicate tests. There is now one failing test that was failing ↵Mike Gehard2011-05-072-2/+2
| | | | | | | | | | | | | | | | before the rename but was never getting run.
* | | | Revert "Merge pull request #275 from pk-amooma/master"José Valim2011-05-072-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
* | | | xml_mini_test.rb now runs.José Valim2011-05-072-8/+1
| | | |
* | | | ordinalize negative numbers patchJason2011-05-072-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com>
* | | | Merge pull request #286 from jasoncodes/marshal_subsecJosé Valim2011-05-072-0/+8
|\ \ \ \ | | | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec).
| * | | | Fix marshal round-tripping of fractional seconds (Time#subsec).Jason Weathered2011-04-172-0/+8
| | | | |
* | | | | Merge pull request #275 from pk-amooma/masterJosé Valim2011-05-072-2/+14
|\ \ \ \ \ | | | | | | | | | | | | properly escape "'" to "'" for XML
| * | | | | test "Escapes special HTML/XML characters" do ...Philipp Kempgen2011-04-261-0/+12
| | | | | |
| * | | | | for escaping HTML can be treated as normal XMLPhilipp Kempgen (Amooma)2011-04-141-2/+2
| | | | | |
| * | | | | properly escape "'" to "&apos;" for XML/HTML (BTW Erubis does that as well)Philipp Kempgen (Amooma)2011-04-141-2/+2
| | | | | |
* | | | | | Merge remote branch 'rolftimmermans/desc_tracker'José Valim2011-05-077-34/+64
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-272-9/+11
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 02:16:47 +0000