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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	cache misses should return self	Aaron Patterson	2013-08-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-08-31	4	-12/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix typos [ci skip]	Carlos Antonio da Silva	2013-08-30	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add documentation for rake db:setup task	Jay Hayes	2013-08-29	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Note functional equivalence in reset task	Jay Hayes	2013-08-29	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix doc for singularize - `pluralized` => `singularized`	Vipul A M	2013-08-27	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document ability to run a single test.	wangjohn	2013-08-21	1	-1/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Removing merge conflict remnants in the guides.	wangjohn	2013-08-21	1	-6/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Moved "`mod_expires` to be enabled" to new line.	Prathamesh Sonpatki	2013-08-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Right now the comment was not rendering properly. # The Expires* directives requires the Apache module `mod_expires` to be # enabled. - After this change - # The Expires* directives requires the Apache module # `mod_expires` to be enabled.
* \| \| \| \| \| \|	Merge pull request #12085 from valk/master	Santiago Pastorino	2013-08-30	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FIX reload! within rails console --sandbox causes undefined method rollb...
\| * \| \| \| \| \| \|	FIX reload! within rails console --sandbox causes undefined method rollback ↵	Val Kotlarov Hoffman	2013-08-30	1	-1/+3
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upon exiting [https://github.com/rails/rails/issues/11834]
* / \| \| \| \| \|	add missing fixtures file	Aaron Patterson	2013-08-30	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12078 from prathamesh-sonpatki/typo	Guillermo Iguaran	2013-08-29	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Fix typo in generators test helpr -> helper [ci skip]
\| * \| \| \| \|	Fix typo in generators test helpr -> helper [ci skip]	Prathamesh Sonpatki	2013-08-30	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #12076 from dabit/master	Carlos Antonio da Silva	2013-08-29	3	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip]
\| * \| \| \| \|	Fix broken link to Fixtures documentation on guides	David Padilla	2013-08-29	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and activerecord tests [ci skip]
* \| \| \| \| \|	Stop messing up with instance variables, use protected as it was meant for	Carlos Antonio da Silva	2013-08-30	1	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Remove not necessary AR changelog entry, fix markup [ci skip]	Carlos Antonio da Silva	2013-08-30	1	-6/+1
\| \| \| \| \| \|
* \| \| \| \| \|	make sure there are actually some categories when running the test	Aaron Patterson	2013-08-29	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	pk should not be required for hm:t associations	Aaron Patterson	2013-08-29	3	-1/+15
\|/ / / / /
* \| \| \| \|	Merge pull request #12062 from strzalek/default-protected-vars	José Valim	2013-08-29	5	-19/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-19/+21
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #12051 from bcherry/preserve_datetime_milliseconds	Andrew White	2013-08-28	2	-0/+9
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	ActiveRecord: Include usecs when quoting DateTime in PostgreSQL adapter
\| * \| \| \| \|	Test that PostgreSQL adapter includes `usec` when quoting `DateTime`	Ben Cherry	2013-08-28	2	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'typecast'	Aaron Patterson	2013-08-28	2	-18/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* typecast: correctly typecast keys, remove conditionals, reduce object allocations no need to to_a the scope remove extra flat_map array avoid extra empty array allocation extract owner id calculation to a method only call to_a when we have to