aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-043-3/+16
|\
| * nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip]Carlos Duclos2012-12-011-1/+1
| * Add documentation for Hash.from_xml [ci skip]HPNeo2012-12-011-0/+13
| * Revert "Remove trailing whitespaces"Florent Guilleux2012-12-0111-31/+33
| * Remove trailing whitespacesFlorent Guilleux2012-12-0111-33/+31
| * nodoc AS::Testing::Pending because is deprecated [ci skip]Carlos Duclos2012-12-011-2/+2
* | Merge pull request #8393 from frodsan/fix_dependend_order_test_exampleCarlos Antonio da Silva2012-12-031-0/+3
|\ \
| * | ensure original encoding doesnt changeFrancesco Rodriguez2012-12-011-0/+3
| |/
* | Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-1/+1
* | Only take the date parts from Time.zone.nowAndrew White2012-12-012-3/+10
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-011-3/+3
|\
| * nodoc AS::Deprecation::InstanceDelegator class [ci skip]Francesco Rodriguez2012-11-291-3/+3
* | Patched Marshal#load to work with constant autoloading (active_support/depend...Uriel Katz2012-12-018-19/+223
* | Make `Time.zone.parse` to work with JavaScript date stringsAndrew White2012-12-013-25/+36
* | Add #seconds_until_end_of_day to DateTime and TimeOlek Janiszewski2012-11-295-1/+84
* | Simplify String#mb_chars and stop proxying #classSteve Klabnik2012-11-283-6/+7
* | Fix documentation for String#mb_chars.Steve Klabnik2012-11-281-4/+1
* | prevent Dependencies#remove_const from autoloading parents [fixes #8301]Xavier Noria2012-11-282-32/+54
|/
* Properly deprecate #pending from AS::TestCaseCarlos Antonio da Silva2012-11-183-8/+10
* Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending"Carlos Antonio da Silva2012-11-183-2/+22
* Please use assert_equal instead of diff directlyRyan Davis2012-11-171-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-172-14/+14
|\
| * Fix another AS::Concern example (class_eval is already called by included)maximerety2012-11-151-4/+2
| * Fix AS::Concern example (current example doesn't work)maximerety2012-11-151-1/+3
| * 1.9 hash syntax in activesupportAvnerCohen2012-11-101-9/+9
* | Simplify (and optimize)Marc-Andre Lafortune2012-11-161-3/+3
* | Use Integer#div instead of Integer#/ to avoid side effects from mathnMarc-Andre Lafortune2012-11-162-1/+9
* | Add docs for CachingKeyGeneratorSantiago Pastorino2012-11-151-0/+6
* | Add nodoc to DummyKeyGenerator since it's a private thingSantiago Pastorino2012-11-151-1/+1
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-153-3/+54
|\ \
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-1/+1
| * | Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+24
| * | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-031-0/+14
| * | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-032-3/+6
| * | Sign cookies using key deriverSantiago Pastorino2012-11-031-0/+10
| |/
* | Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backendRafael Mendonça França2012-11-153-9/+104
|\ \
| * | Make XmlMini.with_backend usable with threadsNikita Afanasenko2012-11-153-9/+104
* | | let remove_constant still delete Kernel#autoload constants [rounds #8213]Xavier Noria2012-11-153-13/+25
|/ /
* | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213]Xavier Noria2012-11-154-13/+44
* | backporting Struct#to_h from ruby 2.0Aaron Patterson2012-11-132-0/+16
* | Use new mocha version and add changelog entry for #8180Carlos Antonio da Silva2012-11-131-0/+2
* | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwardsCarlos Antonio da Silva2012-11-132-25/+5
|\ \
| * | Simplify code by taking advantage of latest mocha (v0.13.0).James Mead2012-11-122-25/+5
* | | `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-123-1/+24
|/ /
* | Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\ \
| * | Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
* | | Test Hash#diff deprecation, also prevent deprecation message in AS testsNikita Afanasenko2012-11-111-1/+3
|/ /
* | Deprecate Hash#diff.Steve Klabnik2012-11-092-0/+4
* | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \
| * | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 21:06:52 +0000