aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* drop array allocations on `html_safe`Aaron Patterson2016-02-081-1/+1
* Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-083-25/+224
|\
| * Manual yield doesn't block new sharesMatthew Draper2016-02-081-5/+6
| * Test the happy path for recursive yields tooMatthew Draper2016-02-081-0/+35
| * Fix a nonsensical ShareLock test.thedarkone2016-02-071-22/+21
| * Eagerly reacquire when start_sharing is nested inside yield_sharesMatthew Draper2016-02-081-11/+18
| * AS::Conc::ShareLock#yield_shares tests.thedarkone2016-02-071-0/+107
| * Hand off the interlock to the new thread in AC::LiveMatthew Draper2016-02-073-15/+65
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-071-2/+2
|\ \ | |/ |/|
| * [ci skip] Fix one more typoPrathamesh Sonpatki2016-01-301-1/+1
| * [ci skip] Fix typoyui-knk2016-01-271-1/+1
* | Merge pull request #23473 from gsamokovarov/kernel-module-functionRafael França2016-02-042-0/+4
|\ \
| * | Don't publicize Kernel core extensionsGenadi Samokovarov2016-02-042-0/+4
* | | Remove unused dependencyMike Perham2016-02-031-1/+0
* | | Remove json gem dependencyMike Perham2016-02-031-1/+0
* | | Fix regression in `Hash#dig` for HashWithIndifferentAccess.Jon Moss2016-02-013-3/+16
* | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-011-3/+0
* | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-1/+6
* | | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-023-22/+118
|\ \ \
| * | | After completing a load, give other threads a chance tooMatthew Draper2016-02-023-15/+46
| * | | While new sharers are blocked, an existing sharer remains re-entrantMatthew Draper2016-02-022-1/+30
| * | | Block new share attempts if there's an exclusive waiterMatthew Draper2016-02-022-8/+44
* | | | [ci skip] Properly indent code in markdownclaudiob2016-02-011-29/+29
|/ / /
* | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+4
* | | Fix broken number_to_currency testsPrathamesh Sonpatki2016-01-291-0/+2
* | | Change number_to_currency behavior for checking negativityPrathamesh Sonpatki2016-01-293-6/+16
|/ /
* | :arrow_left: indentationAkira Matsuda2016-01-281-2/+2
* | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-253-3/+10
|\ \
| * | bumping versionAaron Patterson2016-01-251-1/+1
| * | Eliminate instance level writers for class accessorsAaron Patterson2016-01-221-2/+2
| * | use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-221-0/+7
* | | Fix nodoc to internal class error document some of themVipul A M2016-01-253-0/+5
* | | Put test-case dependent helper Class inside the test caseAkira Matsuda2016-01-243-39/+39
* | | :warning: mismatched indentations at 'end' with 'unless'Akira Matsuda2016-01-242-4/+4
* | | Test files has to be named *_test.rbAkira Matsuda2016-01-242-0/+0
* | | Document scoping issue with Time.use_zoneAndrew White2016-01-231-1/+17
| |/ |/|
* | Merge pull request #22278 from poporul/masterGodfrey Chan2016-01-152-6/+14
|\ \
| * | Allow to store .keep file in cache directoryAlexey Pokhozhaev2015-11-132-6/+14
* | | Update deprecation_horizon to 5.1 from 5.0 [ci skip]Ryuta Kamizono2016-01-141-3/+3
* | | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-131-3/+5
* | | Extract line filtering to Railties.Kasper Timm Hansen2016-01-092-64/+0
* | | Match HashWithIndifferentAccess#default's behaviour with Hash#defaultDavid Cornu2016-01-073-8/+24
* | | Remove unused instance variableschneems2016-01-061-1/+0
* | | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-062-3/+21
* | | Revert "Add Logger option to disable message broadcasts"schneems2016-01-053-45/+22
* | | move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-01-031-3/+2
* | | New changelog entries are added to the top.Rafael Mendonça França2016-01-011-6/+6
* | | Merge pull request #22856 from rthbound/adds-exception-object-to-instrumenter...Rafael França2016-01-013-1/+8
|\ \ \
| * | | Adds exception object to instrumenter's payloadRyan T. Hosford2015-12-313-1/+8
* | | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-312-3/+3