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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Do not dup the binds when visiting the AST"	Rafael Mendonça França + Kassio Borges	2013-08-31	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 71ff7d9c6592b93e2c810a1f464943dd7bd02c7f. Reason: I need to check with @jeremy if we can do this.
* \| \| \| \| \| \|	Don't need to check if the scope respond to call	Rafael Mendonça França + Kassio Borges	2013-08-31	3	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are checking this when defining the default scope and raising an ArgumentError
* \| \| \| \| \| \|	Revert "reconnect after the fork returns"	Rafael Mendonça França	2013-08-31	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit baf5f47b8768c7ec0164ed5ab60e369cdd936d71. Reason: This is breaking the sqlite3 tests with a missing transacion. Could not investigate right now. cc @tenderlove
* \| \| \| \| \| \|	Do not dup the binds when visiting the AST	Rafael Mendonça França	2013-08-31	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The visitor have to consume the bind parameters to make the statements work when the prepared statement option is disabled. Fixes #12023
* \| \| \| \| \| \|	Merge pull request #12095 from kassio/upgrade-jruby-gems	Rafael Mendonça França	2013-08-31	1	-6/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Upgrade jruby dependencies
\| * \| \| \| \| \|	upgrade jruby dependencies	Kassio Borges	2013-08-31	1	-6/+6
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12091 from rywall/pluck-optimization	José Valim	2013-08-31	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Perf] Don't use Enumerable#next in pluck since it is very slow
\| * \| \| \| \| \|	Don't use Enumerable#next in pluck since it is very slow	Ryan Wallace	2013-08-30	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12093 from wangjohn/indentation_in_generator	José Valim	2013-08-31	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Using indent method to refactor controller generator.
\| * \| \| \| \| \|	Using indent method to refactor controller generator.	wangjohn	2013-08-31	1	-3/+3
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[John J. Wang & Prathamesh Sonpatki]
* \| \| \| \| \|	Merge pull request #12090 from njakobsen/merger-performance	Aaron Patterson	2013-08-30	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Performance] Don't create fibers while merging bind variables
\| * \| \| \| \| \|	Don't create fibers just to iterate	Nicholas Jakobsen	2013-08-30	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	reconnect after the fork returns	Aaron Patterson	2013-08-30	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	reduce relation allocations	Aaron Patterson	2013-08-30	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	remove unused variable	Aaron Patterson	2013-08-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	no need to fully qualify	Aaron Patterson	2013-08-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	move the cache to the AR models and populate it on inherited	Aaron Patterson	2013-08-30	3	-24/+50
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	add a failing test for marshal + cache problems	Aaron Patterson	2013-08-30	1	-0/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	no need for the const_get since we lock	Aaron Patterson	2013-08-30	1	-5/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	require a class for cache computations	Aaron Patterson	2013-08-30	2	-2/+4
\| \| \| \| \| \| \|