aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-sec'Aaron Patterson2013-03-181-0/+6
|\
| * JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-151-0/+6
* | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-181-0/+2
* | Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-161-1/+1
* | Fixed a bug where the inflector would replace camelCase strings and disregard...Fred Wu2013-03-171-1/+1
* | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-151-8/+0
* | make new rails apps log to STDOUTTerence Lee2013-03-151-0/+8
* | removing out of date comment. :heart::heart::heart::heart::heart::heart::hea...Aaron Patterson2013-03-121-3/+0
* | drop memory consumption and startup speed by switching to define_methodAaron Patterson2013-03-121-23/+28
* | Remove manual "return true" from AS::TZ match methodCarlos Antonio da Silva2013-03-121-1/+1
* | included "Montevideo" in list of time zone aliases (closes Issue #9628)Gernot2013-03-091-0/+1
|/
* Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
* only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
* Fix deletion of empty directories:Charles Jones2013-02-251-2/+2
* Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-251-1/+1
* Keep second fraction when DateTime#change is called.Chris Baynes2013-02-251-1/+1
* Revert "Simplify code in AS json encoder"Guillermo Iguaran2013-02-251-8/+15
* Merge pull request #8815 from bogdan/simplified-to-json-argsSteve Klabnik2013-02-241-15/+8
|\
| * Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
* | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-241-0/+4
* | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-12/+2
* | prevent minitest from printing a --seed run optionXavier Noria2013-02-241-2/+12
* | Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-221-1/+1
|\ \
| * | Address edge case for number_to_human with units option.hoffm2013-02-221-1/+1
* | | Correct comment for (beginning|end)_of_minuteGert Goet2013-02-222-4/+4
|/ /
* | Added beginning_of_minute support to core_ext calculations for Time and DateTimeGagan Awhad2013-02-212-0/+27
* | Bump up minitest dependency and remove our own reinvented version of Parallel...Akira Matsuda2013-02-191-37/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-151-2/+2
|\ \
| * | Change Class#subclasses doc exampleDalibor Nasevic2013-02-061-2/+2
* | | Supress warning about method redifinitionRyunosuke SATO2013-02-111-0/+2
* | | Merge pull request #9238 from norman/unicode_62Carlos Antonio da Silva2013-02-102-1/+1
|\ \ \
| * | | Update to latest Unicode data.Norman Clarke2013-02-102-1/+1
| |/ /
* | | Merge pull request #8643 from tricknotes/remove-method-redefined-warningAndrew White2013-02-101-0/+1
|\ \ \
| * | | Remove method redefined warningRyunosuke SATO2013-02-111-0/+1
* | | | added compress options for gzipBeyond2013-02-101-2/+2
* | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracyJeremy Kemper2013-02-061-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, ...James Harton2013-01-311-1/+1
* | | | Missing require extract_optionsAkira Matsuda2013-01-312-0/+2
|/ / /
* | | 'minitest/parallel_each' might not always be availableAkira Matsuda + Koichi Sasada2013-01-291-1/+4
* | | Needs to explicitly require 'minitest/parallel_each'Akira Matsuda + Koichi Sasada2013-01-291-0/+2
* | | revamps the RDoc of Object#tryXavier Noria2013-01-281-22/+30
* | | no need for \Z, \z is more conciseXavier Noria2013-01-281-1/+1
* | | Merge pull request #8830 from antoinelyset/masterXavier Noria2013-01-281-2/+5
|\ \ \
| * | | Improve String#squish whitespaces matchingAntoine Lyset2013-01-221-2/+5
* | | | Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-281-1/+1
* | | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-01-262-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix reference to ActiveSupport::ProxyObjectMatt Bridges2013-01-131-1/+1
| * | | Clarified the minute option on DateTime#changeJakob Waller2013-01-101-1/+1
* | | | Revert "Set the default timezone after the initialization since the configura...Carlos Antonio da Silva2013-01-221-16/+14
* | | | resistance is futileXavier Noria2013-01-211-1/+1