| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'json-gem-tests' | Godfrey Chan | 2015-07-11 | 3 | -102/+186 |
| |\ | |||||
| | * | Expand coverage of JSON gem tests | Godfrey Chan | 2015-07-11 | 1 | -16/+30 |
| | | | |||||
| | * | Expand the JSON test coverage for Struct and Hash (?!) | Godfrey Chan | 2015-07-11 | 1 | -1/+13 |
| | | | |||||
| | * | Add tests to ensure we don't interfere with json gem's output | Godfrey Chan | 2015-07-11 | 3 | -102/+160 |
| |/ | |||||
| * | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-07-11 | 1 | -1/+1 |
| |\ | |||||
| | * | [ci skip] Fix hash key to symbol | yui-knk | 2015-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #20847 from zamith/cleanup-am-tests | Abdelkader Boudih | 2015-07-11 | 1 | -61/+2 |
| |\ \ | | | | | | | Removes unnecessary comments from i18n validations tests [ci skip] | ||||
| | * | | Removes unnecessary comments from i18n validations tests [ci skip] | Zamith | 2015-07-11 | 1 | -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_changelog | Kasper Timm Hansen | 2015-07-11 | 1 | -1/+1 |
| |\ \ | | | | | | | fix class name typo [ci skip] | ||||
| | * | | fix class name typo [ci skip] | yuuji.yaginuma | 2015-07-11 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #20832 from ↵ | Xavier Noria | 2015-07-11 | 1 | -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 Miller | 2015-07-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | saying that "behaviour" "behaves" is kind of awkward, how about "works" | Tony Miller | 2015-07-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | [ci skip] change sentence about reporting bugs in contributing guide | Tony Miller | 2015-07-10 | 1 | -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_documentation | Kasper Timm Hansen | 2015-07-11 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | Improve duplicable documentation [ci skip] | ||||
| | * | | | improve duplicable documentation [ci skip] | Julio Lopez | 2015-07-10 | 1 | -1/+5 |
| | |/ / | |||||
| * | | | Merge pull request #20843 from zamith/activemodel-remove-mocha | Claudio B. | 2015-07-10 | 1 | -27/+27 |
| |\ \ \ | | | | | | | | | Remove the reference to mocha in activemodel | ||||
| | * | | | Remove the reference to mocha in activemodel | Zamith | 2015-07-11 | 1 | -27/+27 |
| |/ / / | | | | | | | | | | | | | Activemodel is no longer dependent on mocha, so we can make the comments more generic. | ||||
| * | | | remove Rack::Lock for webrick | Aaron Patterson | 2015-07-10 | 1 | -11/+1 |
| | | | | | | | | | | | | | constant loading should be thread safe now, so lets remove this | ||||
| * | | | Require yaml for XML mini isolation test. | Kasper Timm Hansen | 2015-07-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #17102 from matthewd/load-interlock | Aaron Patterson | 2015-07-10 | 8 | -53/+315 |
| |\ \ \ | | | | | | | | | Concurrent load interlock (rm Rack::Lock) | ||||
| | * | | | Document ShareLock and the Interlock | Matthew Draper | 2015-07-09 | 3 | -9/+42 |
| | | | | | |||||
| | * | | | Fix the Interlock middleware | Matthew Draper | 2015-07-09 | 1 | -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, too | Matthew Draper | 2015-07-09 | 4 | -24/+28 |
| | | | | | |||||
| | * | | | Soften the lock requirements when eager_load is disabled | Matthew Draper | 2015-07-09 | 7 | -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 Hansen | 2015-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | See 2f26f611 for more info. | ||||
| * | | | | Use private method call assertions in Active Model tests. | Kasper Timm Hansen | 2015-07-10 | 4 | -59/+46 |
| | | | | | | | | | | | | | | | | | Also fix Minitest constant reference. | ||||
| * | | | | Add multiple expected calls to assert_called_with. | Kasper Timm Hansen | 2015-07-10 | 2 | -1/+13 |
| | | | | | |||||
| * | | | | we don't really need an extra method to set the script name | Aaron Patterson | 2015-07-10 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Remove useless conditional | Aaron Patterson | 2015-07-10 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | PATH_INFO is already set, so this branch will never execute. | ||||
| * | | | | default `PATH_INFO` to the generated path | Aaron Patterson | 2015-07-10 | 1 | -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 controller | Aaron Patterson | 2015-07-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove useless ivar clearing | Aaron Patterson | 2015-07-10 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | Since we only work with new instances, these ivars will not be set. | ||||
| * | | | | call the `path_parameters=` setter rather than rely on mutations | Aaron Patterson | 2015-07-10 | 1 | -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` mutations | Aaron Patterson | 2015-07-10 | 1 | -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 string | Aaron Patterson | 2015-07-10 | 1 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | Since parameters are converted to a query string, they will automatically be turned in to strings by the query parser | ||||
| * | | | | no more HWIA | Aaron Patterson | 2015-07-10 | 1 | -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 logic | Aaron Patterson | 2015-07-10 | 1 | -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 request | Aaron Patterson | 2015-07-10 | 1 | -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-test | Rafael Mendonça França | 2015-07-10 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Require yaml for time_with_zone isolation test | ||||
| | * | | | | Require yaml for time_with_zone isolation test | Prem Sichanugrist | 2015-07-10 | 1 | -0/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | Same fix as 109e71d2bb6d2305a091fe7ea96d4f6e9c7cd52d but after mocha got removed in 2f28e5b6417fd4e5d6060983b36262737558b613. | ||||
| * | | | | start disconnecting the parameter parser from the instance | Aaron Patterson | 2015-07-10 | 1 | -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 assigning | Aaron Patterson | 2015-07-10 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | We will always make an assignment to the env hash and eliminate a conditional | ||||
| * | | | | Reuse the same test for HWIA reverse_merge! | Rafael Mendonça França | 2015-07-10 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Merge pull request #20828 from Sirupsen/hash-indifferent-dup-default-proc | Rafael Mendonça França | 2015-07-10 | 4 | -13/+58 |
| |\ \ \ \ | |_|/ / |/| | | | active_support/indifferent_access: fix not raising when default_proc does | ||||
| | * | | | test/hash: move lonely indifferent hash test | Simon Eskildsen | 2015-07-10 | 2 | -11/+6 |
| | | | | | |||||
| | * | | | active_support/indifferent_hash: dont raise on to_hash when default_proc raises | Simon Eskildsen | 2015-07-10 | 3 | -1/+22 |
| | | | | | |||||
| | * | | | active_support/indifferent_hash: fix cloning default_proc on dup | Simon Eskildsen | 2015-07-10 | 3 | -1/+30 |
| | | | | | |||||
| * | | | | drop runtime conditionals in parameter parsing | Aaron Patterson | 2015-07-09 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | | | | If we only deal with proc objects, then we can eliminate type checking in the parameter parsing middleware | ||||
| * | | | | Merge pull request #20457 from ronakjangir47/remove_mocha_activesupport | Kasper Timm Hansen | 2015-07-09 | 8 | -65/+87 |
| |\ \ \ \ | | | | | | | | | | | Removed use of mocha in Active Support | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |