aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby.Jerry D'Antonio2015-07-1311-58/+70
* Merge pull request #20852 from hedgesky/fix_typo_in_caching_guideKasper Timm Hansen2015-07-121-1/+1
|\
| * fix typo in caching guide [ci skip]Anton Chuchkalov2015-07-121-1/+1
|/
* Merge pull request #20842 from TheBlasfem/removed_usage_lines_docsClaudio B.2015-07-112-2/+2
|\
| * added description instead of remove usage [ci skip]Julio Lopez2015-07-112-2/+2
* | Merge branch 'json-gem-tests'Godfrey Chan2015-07-113-102/+186
|\ \
| * | Expand coverage of JSON gem testsGodfrey Chan2015-07-111-16/+30
| * | Expand the JSON test coverage for Struct and Hash (?!)Godfrey Chan2015-07-111-1/+13
| * | Add tests to ensure we don't interfere with json gem's outputGodfrey Chan2015-07-113-102/+160
|/ /
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-07-111-1/+1
|\ \
| * | [ci skip] Fix hash key to symbolyui-knk2015-06-241-1/+1
* | | Merge pull request #20847 from zamith/cleanup-am-testsAbdelkader Boudih2015-07-111-61/+2
|\ \ \
| * | | Removes unnecessary comments from i18n validations tests [ci skip]Zamith2015-07-111-61/+2
|/ / /
* | | Merge pull request #20845 from y-yagi/fix_typo_in_changelogKasper Timm Hansen2015-07-111-1/+1
|\ \ \
| * | | fix class name typo [ci skip]yuuji.yaginuma2015-07-111-1/+1
|/ / /
* | | Merge pull request #20832 from mcfiredrill/contributing-to-rails-bugs-arent-f...Xavier Noria2015-07-111-1/+1
|\ \ \
| * | | the key is that the behavior is incorrect [ci skip]Tony Miller2015-07-111-1/+1
| * | | saying that "behaviour" "behaves" is kind of awkward, how about "works"Tony Miller2015-07-101-1/+1
| * | | [ci skip] change sentence about reporting bugs in contributing guideTony Miller2015-07-101-1/+1
| | |/ | |/|
* | | Merge pull request #20838 from TheBlasfem/improve_duplicable_documentationKasper Timm Hansen2015-07-111-1/+5
|\ \ \
| * | | improve duplicable documentation [ci skip]Julio Lopez2015-07-101-1/+5
| |/ /
* | | Merge pull request #20843 from zamith/activemodel-remove-mochaClaudio B.2015-07-101-27/+27
|\ \ \
| * | | Remove the reference to mocha in activemodelZamith2015-07-111-27/+27
|/ / /
* | | remove Rack::Lock for webrickAaron Patterson2015-07-101-11/+1
* | | Require yaml for XML mini isolation test.Kasper Timm Hansen2015-07-111-0/+1
* | | Merge pull request #17102 from matthewd/load-interlockAaron Patterson2015-07-108-53/+315
|\ \ \
| * | | Document ShareLock and the InterlockMatthew Draper2015-07-093-9/+42
| * | | Fix the Interlock middlewareMatthew Draper2015-07-091-5/+14
| * | | Rely on the load interlock for non-caching reloads, tooMatthew Draper2015-07-094-24/+28
| * | | Soften the lock requirements when eager_load is disabledMatthew Draper2015-07-097-47/+263
* | | | Require yaml for time_zone isolation test.Kasper Timm Hansen2015-07-111-0/+1
* | | | Use private method call assertions in Active Model tests.Kasper Timm Hansen2015-07-104-59/+46
* | | | Add multiple expected calls to assert_called_with.Kasper Timm Hansen2015-07-102-1/+13
* | | | we don't really need an extra method to set the script nameAaron Patterson2015-07-101-5/+1
* | | | Remove useless conditionalAaron Patterson2015-07-101-12/+0
* | | | default `PATH_INFO` to the generated pathAaron Patterson2015-07-101-1/+2
* | | | always default the SCRIPT_NAME to whatever is on the controllerAaron Patterson2015-07-101-1/+1
* | | | remove useless ivar clearingAaron Patterson2015-07-101-6/+0
* | | | call the `path_parameters=` setter rather than rely on mutationsAaron Patterson2015-07-101-1/+3
* | | | start collecting `env` mutationsAaron Patterson2015-07-101-5/+3
* | | | Parameters are converted to a query stringAaron Patterson2015-07-101-17/+0
* | | | no more HWIAAaron Patterson2015-07-101-1/+1
* | | | remove param dup'ing logicAaron Patterson2015-07-101-8/+0
* | | | encode / decode parameters before assigning them to the requestAaron Patterson2015-07-101-5/+58
* | | | Merge pull request #20836 from sikachu/fix-time-zone-testRafael Mendonça França2015-07-101-0/+1
|\ \ \ \
| * | | | Require yaml for time_with_zone isolation testPrem Sichanugrist2015-07-101-0/+1
|/ / / /
* | | | start disconnecting the parameter parser from the instanceAaron Patterson2015-07-101-3/+3
* | | | drop a conditional by always assigningAaron Patterson2015-07-101-6/+5
* | | | Reuse the same test for HWIA reverse_merge!Rafael Mendonça França2015-07-101-3/+1
* | | | Merge pull request #20828 from Sirupsen/hash-indifferent-dup-default-procRafael Mendonça França2015-07-104-13/+58
|\ \ \ \ | |_|/ / |/| | |