rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	only call methods that are on the superclass	Aaron Patterson	2015-07-14	3	-7/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to treat the response object as if it's a real response object (not a test object), so we should only call methods that are on the superclass.
* \| \| \|	Merge pull request #20870 from y-yagi/test_runner_inside_engine	Kasper Timm Hansen	2015-07-14	4	-7/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	make test runner work correctly inside engine
\| * \| \| \|	make test runner work correctly inside engine	yuuji.yaginuma	2015-07-12	4	-7/+13
\| \| \| \| \|
* \| \| \| \|	use a lookup table for `assert_response`	Aaron Patterson	2015-07-13	2	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We shouldn't depend on specific methods imlemented in the TestResponse subclass because the response could actually be a real response object. In the future, we should either push the aliased predicate methods in TestResponse up to the real response object, or remove them
* \| \| \| \|	only have one TestResponse class	Aaron Patterson	2015-07-13	2	-5/+2
\| \| \| \| \|
* \| \| \| \|	move buffer caching on to the buffer	Aaron Patterson	2015-07-13	3	-7/+15
\| \| \| \| \|
* \| \| \| \|	Merge pull request #20736 from antoine-lizee/docs	Robin Dupret	2015-07-13	3	-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 impact	antoine.lizee	2015-07-13	3	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Remove JRuby and Rubinius from the travis matrix	Rafael Mendonça França	2015-07-13	1	-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_guide	Kasper Timm Hansen	2015-07-12	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	fix typo in caching guide [ci skip]
\| * \| \| \|	fix typo in caching guide [ci skip]	Anton Chuchkalov	2015-07-12	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #20842 from TheBlasfem/removed_usage_lines_docs	Claudio B.	2015-07-11	2	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Removed usage line docs [ci skip]
\| * \| \|	added description instead of remove usage [ci skip]	Julio Lopez	2015-07-11	2	-2/+2
\| \| \| \|
* \| \| \|	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.