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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	remove deprecate #calculate calls	Jon Leighton	2012-04-26	11	-146/+72
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	remove deprecated #find_in_batches calls	Jon Leighton	2012-04-26	2	-15/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5997 from ↵	Xavier Noria	2012-04-26	1	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avakhov/test_namespaced_controller_dont_indent_blank_lines-refac Namedspaced generator indent method test refactoring
\| * \| \| \| \| \| \| \|	Namedspaced generator indent method test refactoring	Alexey Vakhov	2012-04-26	1	-3/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5998 from aderyabin/fix7	Xavier Noria	2012-04-26	2	-24/+25
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	EXPLAIN only for sqlite3
\| * \| \| \| \| \| \| \|	EXPLAIN only for sqlite3	Andrey Deryabin	2012-04-26	2	-24/+25
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #5995 from kennyj/fix_5847-3	Jon Leighton	2012-04-26	2	-0/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #5847 and #4045. Load AR::Base before loading an application model.
\| * \| \| \| \| \| \| \|	Fix #5847 and #4045. Load AR::Base before loading an application model.	kennyj	2012-04-26	2	-0/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove deprecate #update_all usage	Jon Leighton	2012-04-26	4	-12/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix #scoped deprecations	Jon Leighton	2012-04-26	4	-15/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove deprecated scope stuff	Jon Leighton	2012-04-26	5	-54/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	default_scope with a hash is deprecated	Jon Leighton	2012-04-26	1	-10/+0
\|/ / / / / / / /
* / / / / / / /	fix number_to_human docs [ci skip]	Vijay Dev	2012-04-26	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Routes reloader knows how to reload external files	Yehuda Katz	2012-04-25	3	-4/+73
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix missing Rails.env in route inspect tests	Yehuda Katz	2012-04-25	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix the build	Yehuda Katz	2012-04-25	2	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make files in paths consistent	Yehuda Katz	2012-04-25	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Allow loading external route files from the router	Jose and Yehuda	2012-04-25	9	-3/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications.
* \| \| \| \| \| \|	remove unused method	Jon Leighton	2012-04-25	1	-6/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	remove tests for #with_scope (it's now deprecated)	Jon Leighton	2012-04-25	13	-767/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5973 from academia-edu/master	Aaron Patterson	2012-04-25	2	-3/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always quote hstore keys and values
\| * \| \| \| \| \| \|	Restore .to_s to escape_hstore	Ryan Fitzgerald	2012-04-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Always quote hstore keys and values	Ryan Fitzgerald	2012-04-24	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes.
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'	Jon Leighton	2012-04-25	1	-0/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Define array methods in ActiveRecord::Associations::CollectionProxy	Jorge Bejar	2012-04-18	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if they are not defined or delegated. In this way, we have a performance boost invoking some array methods which are not defined in CollectionAssociation.
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'kennyj/fix_5563'	Jon Leighton	2012-04-25	5	-4/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb
\| * \| \| \| \| \| \| \| \|	Fix #5563. Should reflect the most recent change to either of association / id.	kennyj	2012-04-13	2	-1/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	@stale_state should be nil when a model isn't saved.	kennyj	2012-04-13	3	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	add missing test	Jon Leighton	2012-04-25	1	-0/+12
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	extract #with_scope and #with_exclusive_scope to ↵	Jon Leighton	2012-04-25	2	-122/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	active_record_deprecated_finders
* \| \| \| \| \| \| \| \| \|	extract deprecated code	Jon Leighton	2012-04-25	3	-11/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Extract deprecated code	Jon Leighton	2012-04-25	2	-9/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix interpolation for hash merging	Jon Leighton	2012-04-25	3	-24/+39
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	allow merging a single where value	Jon Leighton	2012-04-25	2	-1/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	extract to active_record_deprecated_finders	Jon Leighton	2012-04-25	1	-6/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	giving a hash to default scope should not be deprecated (well, not for this ↵	Jon Leighton	2012-04-25	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reason)
* \| \| \| \| \| \| \| \| \|	Remove blank line at the end of routes.rb	Jeremy Kemper	2012-04-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5902 from avakhov/generator-no-indent-blank-lines	José Valim	2012-04-25	2	-1/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't indent blank lines in named base generators
\| * \| \| \| \| \| \| \| \| \|	Don't indent blank lines in named base generators	Alexey Vakhov	2012-04-25	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5878 from oscardelben/refactor_observed_class	Vijay Dev	2012-04-25	1	-5/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \|	Refactor Observer.observed_class
\| * \| \| \| \| \| \| \| \| \|	Refactor Observer.observed_class	Oscar Del Ben	2012-04-25	1	-5/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-25	20	-44/+242
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-04-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Revert "Added warning that require_tree includes files in unspecified order. ↵	Vijay Dev	2012-04-25	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. " This reverts commit 9dbd511172170f60b96012b7b87044638c3962b8. Reason: Sounds like something for the guide, not the template.
\| * \| \| \| \| \| \| \| \| \|	removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and ↵	Vijay Dev	2012-04-25	1	-2/+0
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	189a1728b561c19404f814979fd73adc5bea554d [ci skip]
\| * \| \| \| \| \| \| \| \|	Add partials explanation to getting started guide	Oscar Del Ben	2012-04-25	1	-0/+31
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add screenshot to updating post section	Oscar Del Ben	2012-04-25	2	-1/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix code syntax	Oscar Del Ben	2012-04-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add include documentation to serialization	Oscar Del Ben	2012-04-25	1	-1/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	improve serialization doc	Oscar Del Ben	2012-04-25	1	-4/+5
\| \| \| \| \| \| \| \| \| \|