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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Custom flash should be defined only for the class that defines it and it's ↵	Ricardo de Cillo	2013-09-13	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	subclasses.
* \| \| \| \| \| \| \|	Merge pull request #12216 from suginoy/a-an	Rafael Mendonça França	2013-09-13	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fix typos: the indefinite articles(a -> an).
\| * \| \| \| \| \| \|	Fix typos: the indefinite articles(a -> an)	SUGINO Yasuhiro	2013-09-13	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add CHANGELOG entry for #12149	Rafael Mendonça França	2013-09-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #12159 from nashby/issue-12149	Rafael Mendonça França	2013-09-12	2	-1/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not break params filtering on nil values
\| * \| \| \| \| \| \| \|	do not break params filtering on nil values	Vasiliy Ermolovich	2013-09-07	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes #12149
* \| \| \| \| \| \| \| \|	Removed semicolon and added space	Anupam Choudhury	2013-09-13	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Merge pull request #12208 from mjhoy/patch-1"	Rafael Mendonça França	2013-09-12	1	-0/+4
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-09-13	1	-10/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change documentation to consistently refer to the same object	Earl J St Sauver	2013-09-08	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The documentation in this section is referring to a profile, so the resource that's created should probably also be a profile of some sort.
\| * \| \| \| \| \| \| \|	Blacklist refferenced in docs is actually whitelist	Earl J St Sauver	2013-09-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The docs refference a blacklist, but really what's being described is a whitelist. Anything that matches the constraint gets through to the path.
* \| \| \| \| \| \| \| \|	remove outdated docs	Michael Hoy	2013-09-12	1	-4/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Reset ActionView::Base.logger instead of AC::Base.logger	Akira Matsuda	2013-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
* \| \| \| \| \| \| \| \|	Refactor handling of action normalization	Max Shytikov	2013-09-10	1	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
* \| \| \| \| \| \| \| \|	Make AC standalone rendering work	Santiago Pastorino	2013-09-10	2	-2/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove helper fixtures not used in any test	claudiob	2013-09-09	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The fixture for module AbcHelper defines three functions bare_a, bare_b and bare_c, but only bare_a is used in the code that tests helper functions.
* \| \| \| \| \| \| \| \|	Remove BasicRendering tests	José Valim	2013-09-09	2	-10/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove remaining coupling with AV in MimeResponds	José Valim	2013-09-09	3	-5/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove BasicRendering and remove template functionality from AbsC::Rendering	José Valim	2013-09-09	4	-40/+19
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Do not use instance variables if they are not reused elsewhere	Carlos Antonio da Silva	2013-09-06	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	render_to_string shouldn't play with response_body	Santiago Pastorino	2013-09-04	1	-4/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \|	Fix a few typos. [ci skip]	namusyaka	2013-09-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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	1	-7/+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
* \| \| \| \| \| \|	Return to using protected_instance_variables in AV	Łukasz Strzałkowski	2013-09-02	1	-5/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Port all remaining self.protected_instance_variables to class methods"	Łukasz Strzałkowski	2013-09-02	4	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
* \| \| \| \| \| \|	Reuse variable to avoid symbol usage	Carlos Antonio da Silva	2013-08-31	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #11912 from jonkessler/respond-to-signature-fixes	Rafael Mendonça França	2013-08-31	2	-1/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
\| * \| \| \| \| \|	update Rails::Railtie::Configuration and ↵	Jon Kessler	2013-08-16	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::Response#respond_to? to accept include_private argument
* \| \| \| \| \| \|	Stop messing up with instance variables, use protected as it was meant for	Carlos Antonio da Silva	2013-08-30	1	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12062 from strzalek/default-protected-vars	José Valim	2013-08-29	4	-17/+17
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Port all remaining self.protected_instance_variables to class methods
\| * \| \| \| \| \|	Port all remaining self.protected_instance_variables to class methods	Łukasz Strzałkowski	2013-08-29	4	-17/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improve AP changelog regarding AV extraction [ci skip]	Carlos Antonio da Silva	2013-08-26	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Fix formatting of error message	Łukasz Strzałkowski	2013-08-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it oneliner
* \| \| \| \| \|	Change description of BasicRendering#render	Łukasz Strzałkowski	2013-08-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're not dealing with templates here [ci skip]
* \| \| \| \| \|	Simplify if statements	Łukasz Strzałkowski	2013-08-25	1	-6/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Move abstract's controller tests to AV	Łukasz Strzałkowski	2013-08-25	15	-891/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ones that were actually testing AV functionality and should belong in there
* \| \| \| \| \|	Describe BasicRendering shortly	Łukasz Strzałkowski	2013-08-25	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Extend basic rendering, test it in railties	Łukasz Strzałkowski	2013-08-25	2	-22/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Load HTML in ActionView not ActionPack	Łukasz Strzałkowski	2013-08-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML Scanner is part of ActionView and it should be loaded along with it
* \| \| \| \| \|	Update AP changelog	Łukasz Strzałkowski	2013-08-25	1	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Basic rendering test	Łukasz Strzałkowski	2013-08-25	1	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Move AP's capture tests to AV	Łukasz Strzałkowski	2013-08-25	1	-79/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Move remaining layouts tests to AV	Łukasz Strzałkowski	2013-08-25	10	-270/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Remove unused fixtures and models from AP tests	Łukasz Strzałkowski	2013-08-25	7	-12/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Move render_test to AV	Łukasz Strzałkowski	2013-08-25	1	-1298/+106
\| \| \| \| \| \|
* \| \| \| \| \|	Fist stab on basic rendering	Łukasz Strzałkowski	2013-08-25	3	-0/+20
\| \| \| \| \| \|