aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Clean up gemspecsVinny Diehl2012-11-081-9/+10
* | | cleaning up constantize testsAaron Patterson2012-11-071-44/+44
* | | fix warnings in Ruby 2.0Aaron Patterson2012-11-072-0/+4
* | | mocha_standalone is now deprecated. Switch to mocha/api.Jeremy Kemper2012-11-051-1/+1
* | | Make the tests pass with minitest 4.2Rafael Mendonça França2012-11-051-0/+3
* | | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
* | | Refactor Inflector#ordinal to avoid converting the number twiceCarlos Antonio da Silva2012-11-041-2/+4
* | | Fix typo in test nameCarlos Antonio da Silva2012-11-042-3/+2
* | | Use `tag!` instead of `method_missing` in `to_xml` conversions.Nikita Afanasenko2012-11-043-5/+9
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-034-9/+9
|\ \
| * | Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-2/+2
| * | fix output messages - docs [ci skip]Francesco Rodriguez2012-10-224-6/+6
| * | More changes around 1.9 hash syntaxAvnerCohen2012-10-212-4/+4
* | | Fixed timezone mapping of Solomon Islands.Steve Klabnik2012-11-012-1/+3
| |/ |/|
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3013-15/+23
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-294-6/+12
* | atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-292-2/+9
* | Merge pull request #8046 from pmahoney/exceptions_as_flow_controlRafael Mendonça França2012-10-281-2/+2
|\ \
| * | Replace flow-control exception with explicit test.Patrick Mahoney2012-10-271-2/+2
* | | Fix some assert_raise calls containing messages in Active SupportCarlos Antonio da Silva2012-10-282-7/+15
|/ /