aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* remove bad test.Aaron Patterson2015-06-251-4/+0
* Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-typesZachary Scott2015-06-181-1/+19
|\
| * Added documentation about passing custom disallowed types to Hash#from_xml [...Prathamesh Sonpatki2015-06-181-1/+19
* | enforce a depth limit on XML documentsAaron Patterson2015-06-163-10/+15
* | Escape HTML entities in JSON keysRafael Mendonça França2015-06-162-0/+11
* | Merge pull request #20440 from repinel/fix-message-verifier-encoding-issueMatthew Draper2015-06-162-1/+2
|\ \
| * | Fix the message verifier encoding issueRoque Pinel2015-06-142-1/+2
* | | Fix inflector test by using dup inflections when it needs to be changedRoque Pinel2015-06-151-86/+68
|/ /
* | Merge pull request #18365 from pocke/fix_datatime_compareAaron Patterson2015-06-123-1/+15
|\ \
| * | DateTime#<=> return nil when compare to the invalid String as Time.pocke2015-01-063-1/+15
* | | Merge pull request #20494 from knovoselic/active_support_concern_class_method...Rafael Mendonça França2015-06-122-1/+26
|\ \ \
| * | | Fix for #20489 - ActiveSupport::Concern#class_methods affects parent classesKristijan Novoselic2015-06-122-1/+26
* | | | select the AR adapter through `bin/test`.Yves Senn2015-06-111-0/+1
* | | | use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-0/+3
* | | | inline test runner check into `as/testing/autorun.rb`.Yves Senn2015-06-111-1/+8
| |_|/ |/| |
* | | Use block variable instead of globalRoque Pinel2015-06-091-1/+1
|/ /
* | Use block variable instead of globalRoque Pinel2015-06-081-1/+1
* | Merge pull request #19571 from kaspth/improve-runner-integrationYves Senn2015-06-082-0/+64
|\ \
| * | Improve test runner's Minitest integration.Kasper Timm Hansen2015-06-042-0/+64
* | | Code fix in CHANGELOGAditya Sanghi2015-06-081-1/+1
* | | Merge pull request #20464 from ronakjangir47/active_support_stubbingArthur Nogueira Neves2015-06-0710-309/+366
|\ \ \
| * | | Removed mocha stubbing in active_supportRonak Jangir2015-06-0710-309/+366
* | | | A few documentation tweaks [ci skip]Robin Dupret2015-06-073-5/+5
|/ / /
* | | Merge pull request #20443 from teoljungberg/thoughtbot-capitalizationKasper Timm Hansen2015-06-051-1/+1
|\ \ \
| * | | Fix `thoughtbot` capitalizationTeo Ljungberg2015-06-051-1/+1
* | | | Require active_support/duration.Jimmy Cuadra2015-06-041-0/+1
| |/ / |/| |
* | | Merge pull request #20410 from schneems/schneems/boo-global-varsRafael Mendonça França2015-06-011-2/+2
|\ \ \
| * | | Use block variable instead of globalschneems2015-06-011-2/+2
* | | | Merge pull request #20362 from kddeisz/enumerable_pluckRafael Mendonça França2015-06-012-2/+18
|\ \ \ \
| * | | | Allow Enumerable#pluck to take a splat.Kevin Deisz2015-05-292-2/+18
| | |/ / | |/| |
* | | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-011-1/+1
|\ \ \ \
| * | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-301-1/+1
| | |/ / | |/| |
* / | | Fix a range of values for parameters of the Time#changeNikolay Kondratyev2015-06-013-1/+9
|/ / /
* / / Revert "Replace use of alias chains with prepend at core_ext/date and core_ex...Roque Pinel2015-05-295-79/+89
|/ /
* | Merge pull request #19878 from pabloh/replace_alias_chains_with_prependRafael Mendonça França2015-05-285-89/+79
|\ \
| * | Replace use of alias chains with prepend at core_ext/datePablo Herrero2015-05-045-89/+79
* | | Merge pull request #20267 from kaspth/fix-minitest-constant-clashingRafael Mendonça França2015-05-288-43/+45
|\ \ \
| * | | Avoid E constant clashing with Minitest defined version.Kasper Timm Hansen2015-05-228-43/+45
* | | | Add Enumerable#pluck.Kevin Deisz2015-05-283-0/+20
* | | | Remove unused package tasksArun Agrawal2015-05-281-7/+0
* | | | Fix indentation warning on active_support ordered_optionsMehmet Emin İNAÇ2015-05-271-1/+1
* | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-271-7/+0
|\ \ \ \
| * | | | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
* | | | | Merge pull request #20297 from gouravtiwari/patch-9Claudio B.2015-05-261-0/+6
|\ \ \ \ \
| * | | | | Added multibyte slice! example to doc [ci skip]Gourav Tiwari2015-05-261-0/+6
* | | | | | Merge pull request #20208 from gaurish/raise_on_missing_ordered_optionsRafael Mendonça França2015-05-263-1/+39
|\ \ \ \ \ \
| * | | | | | Add bang version to OrderedOptionsGaurish Sharma2015-05-233-1/+36
| | |/ / / / | |/| | | |
* | | | | | Remove redundant 'like' from doc of slice! method [ci skip]Mehmet Emin İNAÇ2015-05-261-1/+1
* | | | | | Merge pull request #16938 from akshay-vishnoi/remove-depricationYves Senn2015-05-264-168/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove `.superclass_delegating_accessor`. Refer #14271Akshay Vishnoi2015-05-244-168/+4
| |/ / / /