aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #20736 from antoine-lizee/docsRobin Dupret2015-07-133-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] docs: making clear that perform_caching has a limited impact
| * | | | | | | | | | | | [ci skip] doc: making clear that perform_caching has a limited impactantoine.lizee2015-07-133-2/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Remove JRuby and Rubinius from the travis matrixRafael Mendonça França2015-07-131-4/+0
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will save Travis some precious resource since it will not need to run 18 jobs for these Ruby implementations on every push or pull request. We do care about these implementations but we should fix the build locally before having it running on travis. We would love to have someone working on this but right now it is not our reality.
* | | | | | | | | | | | Merge pull request #20852 from hedgesky/fix_typo_in_caching_guideKasper Timm Hansen2015-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | fix typo in caching guide [ci skip]
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Removed usage line docs [ci skip]
| * | | | | | | | | | 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]
| * | | | | | | | | | | Removes unnecessary comments from i18n validations tests [ci skip]Zamith2015-07-111-61/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These comments do not add a lot to the readability, grepability or overall understanding of the tests, therefore I believe they can be safely removed.
* | | | | | | | | | | Merge pull request #20845 from y-yagi/fix_typo_in_changelogKasper Timm Hansen2015-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix class name typo [ci skip]
| * | | | | | | | | | | fix class name typo [ci skip]yuuji.yaginuma2015-07-111-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20832 from ↵Xavier Noria2015-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mcfiredrill/contributing-to-rails-bugs-arent-fixes [ci skip] change sentence about reporting bugs in contributing guide
| * | | | | | | | | | | 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
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think I know what this sentence is trying to say, but the sentence didn't really make sense, bugs don't fix things! How about this take on it? :sweat_smile:
* | | | | | | | | | | Merge pull request #20838 from TheBlasfem/improve_duplicable_documentationKasper Timm Hansen2015-07-111-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve duplicable documentation [ci skip]
| * | | | | | | | | | | 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 activemodel
| * | | | | | | | | | | Remove the reference to mocha in activemodelZamith2015-07-111-27/+27
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activemodel is no longer dependent on mocha, so we can make the comments more generic.
* | | | | / / / / / / remove Rack::Lock for webrickAaron Patterson2015-07-101-11/+1
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant loading should be thread safe now, so lets remove this
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Concurrent load interlock (rm Rack::Lock)
| * | | | | | | | | | Document ShareLock and the InterlockMatthew Draper2015-07-093-9/+42
| | | | | | | | | | |
| * | | | | | | | | | Fix the Interlock middlewareMatthew Draper2015-07-091-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't actually lean on Rack::Lock's implementation, so we'll just copy it instead. It's simple enough that that's not too troubling.
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to fully disable concurrent requests: just ensure that loads are performed in isolation.
* | | | | | | | | | | Require yaml for time_zone isolation test.Kasper Timm Hansen2015-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 2f26f611 for more info.
* | | | | | | | | | | Use private method call assertions in Active Model tests.Kasper Timm Hansen2015-07-104-59/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix Minitest constant reference.
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATH_INFO is already set, so this branch will never execute.
* | | | | | | | | | | default `PATH_INFO` to the generated pathAaron Patterson2015-07-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were already generating a path in the previous code (it was just not returned), so lets just use the already computed path to popluate the PATH_INFO header
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we only work with new instances, these ivars will not be set.
* | | | | | | | | | | call the `path_parameters=` setter rather than rely on mutationsAaron Patterson2015-07-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should call the setter on `path_parameters` so that we know the hash will only contain the values that we've set.
* | | | | | | | | | | start collecting `env` mutationsAaron Patterson2015-07-101-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd like to put all env mutations together so we can understand how to change this code to call `call` on the controller
* | | | | | | | | | | Parameters are converted to a query stringAaron Patterson2015-07-101-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since parameters are converted to a query string, they will automatically be turned in to strings by the query parser
* | | | | | | | | | | no more HWIAAaron Patterson2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non_path_parameters is used internally (it never escapes this method) so we should be able to safely use a regular hash.
* | | | | | | | | | | remove param dup'ing logicAaron Patterson2015-07-101-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we are serializing parameters, we don't need to do all the dup checks on each object.
* | | | | | | | | | | encode / decode parameters before assigning them to the requestAaron Patterson2015-07-101-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should roundtrip the parameters through their respective encoders / decoders so that the controller will get parameters similar to what they actually get in a real world situation
* | | | | | | | | | | 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 test
| * | | | | | | | | | | Require yaml for time_with_zone isolation testPrem Sichanugrist2015-07-101-0/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same fix as 109e71d2bb6d2305a091fe7ea96d4f6e9c7cd52d but after mocha got removed in 2f28e5b6417fd4e5d6060983b36262737558b613.
* | | | | | | | | | | start disconnecting the parameter parser from the instanceAaron Patterson2015-07-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass in the instance variable to start decoupling the meat of the parser from the instance of the middleware
* | | | | | | | | | | drop a conditional by always assigningAaron Patterson2015-07-101-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will always make an assignment to the env hash and eliminate a conditional
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:38:19 +0000