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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	reduce duplication somewhat	Aaron Patterson	2013-09-06	1	-14/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	make the duplicate code more similar	Aaron Patterson	2013-09-06	1	-4/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	auto link hm:t fixture join tables like habtm	Aaron Patterson	2013-09-06	2	-0/+51
\|/ / / / / / / /
* \| \| \| \| \| \| \|	don't depend on object state when reading fixture files	Aaron Patterson	2013-09-06	1	-8/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	ensure @model_class is initialized	Aaron Patterson	2013-09-06	1	-0/+1
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Fix failure with minitest 5.0.7	Carlos Antonio da Silva	2013-09-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require minitest/mock in test where stub method is needed. Apparently this was being "imported" by minitest pride plugin, which previously required "minitest/autorun", that required "minitest/mock", making the method available by chance. It has been changed in minitest: https://github.com/seattlerb/minitest/commit/595ce955c0d89575726d10fc18d2afd8f334bcbe So we need to make sure we require what we really need where necessary.
* \| \| \| \| \| \|	Do not use instance variables if they are not reused elsewhere	Carlos Antonio da Silva	2013-09-06	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12148 from gzohari/callback-typo	Carlos Antonio da Silva	2013-09-06	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in set_callback docs. [ci skip]
\| * \| \| \| \| \| \|	Fix typo in set_callback docs. [ci skip]	Gilad Zohari	2013-09-06	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	no need to dup	Aaron Patterson	2013-09-05	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	push logic outside the FixtureSet constructor	Aaron Patterson	2013-09-05	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	only construct the FixtureSet with AR models	Aaron Patterson	2013-09-05	1	-2/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	push constant lookup in the a cache object	Aaron Patterson	2013-09-05	1	-2/+21
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12143 from rajcybage/fixing_typos	Carlos Antonio da Silva	2013-09-05	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix actionview and activemodel test cases typos
\| * \| \| \| \| \| \|	fix actionview and activemodel test cases typos	Rajarshi Das	2013-09-05	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #12139 from vipulnsward/typos_av	Yves Senn	2013-09-05	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix method name typos
\| * \| \| \| \| \| \| \|	Fix method name typos	Vipul A M	2013-09-05	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #12130 from egilburg/patch-1	Yves Senn	2013-09-05	1	-2/+33
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Document a difference between pluck and select [ci skip]
\| * \| \| \| \| \| \| \|	Document a difference between pluck and select [ci skip]	Eugene Gilburg	2013-09-04	1	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain that `pluck` differs from `select` in that it does not construct `ActiveRecord` objects and thus model-level overrides are unavailable.
* \| \| \| \| \| \| \| \|	Add a test case for exists? with multiple values	Rafael Mendonça França + Kassio Borges	2013-09-04	1	-0/+1
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	render_to_string shouldn't play with response_body	Santiago Pastorino	2013-09-04	1	-4/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #12094 from brocktimus/master	Steve Klabnik	2013-09-04	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Substitute dynamic finders in 4.0 release notes [ci skip]
\| * \| \| \| \| \| \| \|	Adjusting 4.0 release notes to show more appropriate replacements for ↵	Brock Trappitt	2013-09-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynamic finders [ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #12077 from estsauver/doc_fix	Steve Klabnik	2013-09-04	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Update mapper documenation for match helper [ci skip]
\| * \| \| \| \| \| \| \|	Update mapper documenation for match helper [ci skip]	Earl St Sauver	2013-08-30	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown.
* \| \| \| \| \| \| \| \|	Merge pull request #11958 from jetthoughts/extract_pre_process_orders_args	Yves Senn	2013-09-04	5	-15/+52
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	Re-use order arguments pre-processing for reorder
\| * \| \| \| \| \| \| \|	Extracted from `order` processing of arguments, and use it for `reorder` to ↵	Paul Nikitochkin	2013-09-04	5	-15/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be consistent.
* \| \| \| \| \| \| \| \|	adding a hm:t test for singleton ar objects	Aaron Patterson	2013-09-03	1	-0/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	support anonymous classes on has_many associations	Aaron Patterson	2013-09-03	3	-1/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #12065 from SamSaffron/result_optimisation	Aaron Patterson	2013-09-03	1	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf: micro optimised Result column hash_row creation
\| * \| \| \| \| \| \| \| \|	Perf: micro optimised Result column hash_row creation	Sam	2013-08-29	1	-1/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #12126 from namusyaka/fix-some-typos	Vijay Dev	2013-09-03	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a few typos.
\| * \| \| \| \| \| \| \| \| \|	Fix a few typos. [ci skip]	namusyaka	2013-09-04	2	-3/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #12085 from valk/master"	Santiago Pastorino	2013-09-03	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 15455d76c8d33b3767a61e0cdd2de0ff592098ef, reversing changes made to ffa56f73d5ae98fe0b8b6dd2ca6f0dffac9d9217.
* \| \| \| \| \| \| \| \| \|	Merge pull request #12121 from strzalek/move-methods-to-abs-controller	Rafael Mendonça França	2013-09-03	4	-62/+49
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move glue methods & BasicRendering to AbstractController
\| * \| \| \| \| \| \| \| \| \|	Move BasicRendering to AbstractController	Łukasz Strzałkowski	2013-09-03	3	-29/+29
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Make Mime::TEXT default format in AbstractController	Łukasz Strzałkowski	2013-09-03	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move skeleton methods from AV to AbsC	Łukasz Strzałkowski	2013-09-03	2	-29/+19
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The methods: * #render_to_body * #render_to_string * #_normalize_render Haven't had anything specyfic to ActionView. This was common code which should belong to AbstractController
* \| \| \| \| \| \| \| \| \|	Merge pull request #12110 from strzalek/revert-default-protected-instance-vars	Rafael Mendonça França	2013-09-02	6	-25/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert default protected instance vars
\| * \| \| \| \| \| \| \| \| \|	Return to using protected_instance_variables in AV	Łukasz Strzałkowski	2013-09-02	2	-9/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Revert "Port all remaining self.protected_instance_variables to class methods"	Łukasz Strzałkowski	2013-09-02	5	-21/+19
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
* \| \| \| \| \| \| \| \| \|	Merge pull request #12105 from rajcybage/fixing_typo	Yves Senn	2013-09-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|	fix the typo [ci skip]
\| * \| \| \| \| \| \| \| \|	fix the typo [ci skip]	Rajarshi Das	2013-09-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix the typo newstopics => new topics in action view cache helper
* \| \| \| \| \| \| \| \| \|	Remove useless comment and white spaces :scissors: [ci skip]	Carlos Antonio da Silva	2013-09-01	2	-3/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Reuse variable to avoid symbol usage	Carlos Antonio da Silva	2013-08-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #12097 from kassio/remove-unused-delegate-on-railtie	José Valim	2013-08-31	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused delegate
\| * \| \| \| \| \| \| \| \| \|	Remove unused delegate	Kassio Borges	2013-08-31	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related with commit 4a2a504
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #11912 from jonkessler/respond-to-signature-fixes	Rafael Mendonça França	2013-08-31	4	-2/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
\| * \| \| \| \| \| \| \| \| \| \|	update Rails::Railtie::Configuration and ↵	Jon Kessler	2013-08-16	4	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::Response#respond_to? to accept include_private argument
* \| \| \| \| \| \| \| \| \| \| \|	clear all connections before forking	Aaron Patterson	2013-08-31	1	-0/+3
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|