aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* remove deprecation warningeileencodes2014-05-132-6/+4
| | | | | This deprecation was released in 4.1.0 and can be removed for 4.2.0, deprecation message / handling is no longer necessary.
* Merge pull request #15072 from mjtko/fix/issue-15064Rafael Mendonça França2014-05-133-1/+14
|\ | | | | [Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output
| * Require active_support/core_ext/string/output_safety and use html_safe ↵Mark J. Titorenko2014-05-121-1/+2
| | | | | | | | rather than use non-public SafeBuffer API.
| * Use block parameter rather than `$1` during `gsub!` so ↵Mark J. Titorenko2014-05-123-1/+13
| | | | | | | | | | | | `ActiveSupport::SafeBuffer` values aren't mangled. Fixes #15064
* | Merge pull request #15073 from ifyouseewendy/masterRafael Mendonça França2014-05-131-5/+32
|\ \ | | | | | | Update and add tests in array_ext_test.rb
| * | Update require in `array_ext_test.rb`wendi2014-05-131-3/+2
| | | | | | | | | | | | Removed `FIMXE` tag to require necessary file but not the whole core_ext
| * | Update and add tests in array_ext_test.rbwendi2014-05-131-2/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix `test_to_with_instruct` typo to `test_to_xml_with_instruct` - Rename `test_to_xml` to `test_to_xml_with_hash_elements` to make test name more specific. - Add `test_to_xml_with_non_hash_elements` and `test_to_xml_with_non_hash_different_type_elements` `to_xml` behaves different when containing elements are same and different types. - Add `test_to_xml_with_indent_set`
* | Do not check defined?(CGI) on every call #to_queryprintercu2014-05-131-1/+1
| |
* | flip conditional to use if/else instead of unless/elseeileencodes2014-05-121-3/+3
|/ | | | Use if/else instead of unless/else so conditional reads better.
* Tidy up implementation of #15010Andrew White2014-05-112-11/+7
|
* Make TimeZone#parse behave more like Time#parse.Ulysse Carion2014-05-113-1/+25
| | | | | Namely, if the mday is omitted but any other upper components are, then instead of supplying the mday from the current time, it defaults to 1.
* Keep method's description/documentation consistent [ci skip]Santosh Wadghule2014-05-111-3/+3
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-05-101-2/+5
|\
| * [ci skip] doc ActiveSupport::TimeWithZone#to_sschneems2014-05-091-2/+5
| | | | | | Current docs are wrong. Does not accept strftime inputs.
* | Change 'a' to 'an' [ci skip]Santosh Wadghule2014-05-091-1/+1
| |
* | Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-072-15/+36
|\ \ | | | | | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738
| * | Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-092-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously merging into a hash with a falsy value would not result in the merge-block being called. The fix is simply to check for presence of the key in the hash. The documentation example for `deep_merge` now appropriately demonstrates what a deep merge does.
* | | several enhancements to humanize [closes #12288]Xavier Noria2014-05-063-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Strips leading underscores. * Changes some unnecessary gsub!s to sub!s. * Replaces some anchors ^, $ with \A, \z. * Documents that human inflection rules are applied. * Documents that words are downcased except acronyms. * Adds an example with an acronym. * Rewords docs.
* | | Improve CHANGELOG [ci skip]Rafael Mendonça França2014-05-041-2/+2
| | |
* | | No need the else clauseRafael Mendonça França2014-05-041-2/+0
| | |
* | | Merge pull request #14949 from bogdan/empty-hash-array-parameterizationRafael Mendonça França2014-05-043-9/+22
|\ \ \ | | | | | | | | [Fixes #14948] Hash#to_query: right serialization for empty hash and array
| * | | [Fixes #14948] Hash#to_query: Changed a way how empty hash and empty array ↵Bogdan Gusiev2014-05-033-9/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | are serialized Empty Hash or Array should not present in serialization result {a: []}.to_query # => "" {a: {}}.to_query # => "" For more info see #14948.
* / | Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its ↵Kuldeep Aggarwal2014-05-042-14/+0
|/ / | | | | | | test case.
* | Warning removed for missmatched indentationArun Agrawal2014-04-261-2/+2
| |
* | Merge pull request #14840 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-04-231-2/+2
|\ \ | | | | | | Correct comment [ci skip]
| * | Correct comment [ci skip]Akshay Vishnoi2014-04-231-2/+2
| | |
* | | Merge pull request #14801 from kuldeepaggarwal/fix-string-inflectionRafael Mendonça França2014-04-222-1/+6
|\ \ \ | | | | | | | | Fix inconsistent behavior from String#pluralize
| * | | Fix inconsistent behavior from String#pluralizeKuldeep Aggarwal2014-04-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: When calling String#pluralize with count=1 then it returned same string, but with count other than 1, returned new string. After: String#pluralize always return a new string. => Prevent mutation of a string inadvertently.
* | | | Changed miss-leading comment [ci skip]Arun Agrawal2014-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this 21dbe6f39b57f52967e92716dbd5e2b894e7a64c 2.1.1 :001 > 'business'.classify => "Business" 2.1.1 :004 > 'calculus'.classify => "Calculu" 2.1.1 :005 >
* | | | [ci-skip] correct the classify example's outputKuldeep Aggarwal2014-04-211-1/+1
| |/ / |/| |
* | | [ci skip] builtin -> built-inAkshay Vishnoi2014-04-202-3/+3
| | |
* | | Merge pull request #14805 from akshay-vishnoi/structure-changeAndrew White2014-04-191-0/+0
|\ \ \ | | | | | | | | multibyte_conformance.rb --> multibyte_conformance_test.rb
| * | | multibyte_conformance.rb --> multibyte_conformance_test.rbAkshay Vishnoi2014-04-191-0/+0
| |/ /
* / / "subhash" --> "sub-hash"Akshay Vishnoi2014-04-191-1/+1
|/ /
* | Fix inconsistent behavior from String#first/#lastErnie Miller2014-04-182-4/+16
| | | | | | | | | | | | | | While calling String#first or String#last with zero or a Fixnum < the string's length returns a new string, a Fixnum >= the string's length returns the string itself. This inconsistency can lead to inadvertent mutation of a string.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-182-1/+11
|\ \
| * | Correct docs as singlton true is not returned hereSteven Harman2014-04-111-1/+1
| | | | | | | | | | | | [ci skip]
| * | Document LoadError core extensionsSteven Harman2014-04-111-1/+4
| | | | | | | | | | | | [ci skip]
| * | Add documentation for Thread#freezeSteven Harman2014-04-061-0/+7
| | |
* | | Object#duplicable?Akshay Vishnoi2014-04-162-16/+12
| | | | | | | | | | | | | | | | | | 1. Improve tests 2. Remove unnecessary constant 3. Add docs for BigDecimal#duplicable?
* | | Move tests for deep_dup and duplicable to object directoryAkshay Vishnoi2014-04-132-0/+0
| | |
* | | Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_defaultRafael Mendonça França2014-04-112-2/+2
|\ \ \ | | | | | | | | Improve debugging support
| * | | Keep debugger support only for rubies < 2.0.0David Rodríguez de Dios2014-04-082-2/+2
| | | |
* | | | Add more test case for #demodulize, Improve documentationAkshay Vishnoi2014-04-113-0/+5
| | | |
* | | | Merge branch 'master' into rm-uuid-fixturesRafael Mendonça França2014-04-106-7/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md
| * \ \ \ Merge pull request #11656 from emre-basala/xml_mini_testRafael Mendonça França2014-04-101-1/+58
| |\ \ \ \ | | | | | | | | | | | | Add tests to ActiveSupport:XmlMini to_tag method
| | * | | | Add tests to ActiveSupport:XmlMini to_tag methodemre-basala2013-08-071-1/+58
| | | | | |
| * | | | | Merge pull request #11411 from dscataglini/masterAaron Patterson2014-04-091-6/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | Active support callback's before/after/around filters are not correctly making their singleton methods private
| | * | | | | private method doesn't work for singleton methods defined this wayDiego Scataglini2013-07-121-6/+12
| | | | | | |
| * | | | | | Add missing require so requiring `active_support/cache` works again.Lucas Mazza2014-04-091-0/+1
| | | | | | |