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

	Commit message (Expand)	Author	Age	Files	Lines
*	Adding first_or_create, first_or_create!, first_or_new and first_or_build to ...	Andrés Mejía	2011-08-30	6	-7/+277
*	adds the asset pipeline guide to the index	Xavier Noria	2011-08-30	3	-2/+7
*	Merge pull request #2684 from waynn/patch-2	Xavier Noria	2011-08-30	1	-4/+4
\|\
\| *	incorporate feedback from vijaydev and dasch to rephrase this to sound more n...	Waynn Lue	2011-08-26	1	-4/+4
* \|	Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracle	Jon Leighton	2011-08-30	1	-1/+7
* \|	Merge pull request #2636 from dasch/document-sprockets-compressors	Aaron Patterson	2011-08-30	1	-7/+23
\|\ \
\| * \|	Document the Sprockets compressors	Daniel Schierbeck	2011-08-30	1	-7/+23
\|/ /
* \|	let SDoc add a link to the source code in GitHub for each method	Xavier Noria	2011-08-29	1	-0/+1
* \|	Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ...	Jon Leighton	2011-08-29	1	-1/+0
* \|	Merge pull request #2720 from biow0lf/master	Xavier Noria	2011-08-29	1	-4/+4
\|\ \
\| * \|	Documentation fixes	Igor Zubkov	2011-08-29	1	-4/+4
* \| \|	Merge pull request #2021 from dasch/more_postgres_utils	Aaron Patterson	2011-08-29	3	-16/+21
\|\ \ \
\| * \| \|	Make #extract_schema_and_table an instance method in Utils	Daniel Schierbeck	2011-07-09	3	-16/+21
* \| \| \|	Move clear_timestamp_attributes into Timestamp module	Jon Leighton	2011-08-29	2	-10/+14
* \| \| \|	The join_nodes must be passed to the JoinDependency initializer and therefore...	Jon Leighton	2011-08-29	4	-13/+20
* \| \| \|	Move the bulk alter table code into the abstract mysql adapter, hence it is s...	Jon Leighton	2011-08-29	3	-47/+44
* \| \| \|	Extract simplified_type into the abstract class	Jon Leighton	2011-08-29	3	-23/+24
* \| \| \|	Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapt...	Jon Leighton	2011-08-29	5	-1117/+726
* \| \| \|	Merge pull request #2724 from guilleiguaran/avoid-recursive-call-sprockets-he...	Santiago Pastorino	2011-08-28	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Avoid extra recursive call in Sprockets helpers	Guillermo Iguaran	2011-08-28	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #2723 from guilleiguaran/3-1-0-changelogs	Santiago Pastorino	2011-08-28	3	-0/+27
* \| \| \|	fixing typo	Aaron Patterson	2011-08-28	1	-1/+1
* \| \| \|	Bump rack-cache, rack-test, rack-mount and sprockets up	Santiago Pastorino	2011-08-28	1	-4/+4
* \| \| \|	clear and disable query cache when an exception is raised from called middleware	Aaron Patterson	2011-08-28	2	-1/+33
\| \|/ / \|/\| \|
* \| \|	Merge pull request #2711 from dasch/patch-3	Aaron Patterson	2011-08-28	1	-14/+3
\|\ \ \
\| * \| \|	Refactor ActionDispatch::Http::UploadedFile	Daniel Schierbeck	2011-08-28	1	-14/+3
\|/ / /
* \| \|	deletes spurious arrow	Xavier Noria	2011-08-27	1	-1/+1
* \| \|	Merge pull request #2714 from vijaydev/docs	Santiago Pastorino	2011-08-27	3	-15/+19
\|\ \ \
\| * \| \|	doc fixes	Vijay Dev	2011-08-28	3	-15/+19
\|/ / /
* \| \|	use sdoc to generate the API	Xavier Noria	2011-08-27	2	-2/+4
* \| \|	stop messing with the load path, load path should be adjusted in the test task	Aaron Patterson	2011-08-26	1	-7/+0
* \| \|	Merge pull request #2702 from arunagw/removed_unused_var	Santiago Pastorino	2011-08-26	1	-1/+1
\|\ \ \
\| * \| \|	Removed Unused Variable.	Arun Agrawal	2011-08-26	1	-1/+1
\|/ / /
* \| \|	Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8	Aaron Patterson	2011-08-25	1	-1/+1
\|\ \ \
\| * \| \|	Fix failing asset debug test under 1.8	Guillermo Iguaran	2011-08-25	1	-1/+1
\|/ / /
* \| \|	Force binary data inserted for a string data type to utf-8 and log an	Aaron Patterson	2011-08-25	2	-3/+34
* \| \|	Merge pull request #2681 from guilleiguaran/doc-changes	Xavier Noria	2011-08-25	2	-1/+12
\|\ \ \
\| * \| \|	Update Debugging Assets section of Assets Pipeline guide	Guillermo Iguaran	2011-08-25	1	-1/+8
\| * \| \|	Add missing CHANGELOG entries for Railties	Guillermo Iguaran	2011-08-25	1	-0/+4
\| \| \|/ \| \|/\|
* \| \|	Revert all the stuff to do with disallowing non-public methods for Module#del...	Jon Leighton	2011-08-25	7	-194/+3
* \| \|	Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers	Santiago Pastorino	2011-08-25	1	-4/+4
\|\ \ \
\| * \| \|	Removing redundant stringify_keys in Sprockets helpers	Guillermo Iguaran	2011-08-25	1	-4/+4
* \| \| \|	Merge pull request #2695 from dasch/more-debug-assets	Aaron Patterson	2011-08-25	1	-3/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Don't require a specific value for the ?debug flag	Daniel Schierbeck	2011-08-25	1	-3/+1
\|/ / /
* \| \|	Yes we need this to pass the test. we are using config.log_level.	Arun Agrawal	2011-08-25	1	-2/+2
* \| \|	Merge pull request #2690 from dasch/pretty-debug-assets	Aaron Patterson	2011-08-25	1	-4/+4
\|\ \ \
\| * \| \|	Make Sprockets::Helpers::RailsHelper#debug_assets? more readable	Daniel Schierbeck	2011-08-25	1	-4/+4
\| \|/ /
* \| \|	Merge pull request #2688 from dasch/refactor-asset-debugging-tests	Aaron Patterson	2011-08-25	2	-42/+56
\|\ \ \
\| * \| \|	Move asset debugging tests into a separate test case	Daniel Schierbeck	2011-08-25	2	-42/+56
\| \|/ /
* \| \|	Merge pull request #2694 from bogdan/internal_validation	Santiago Pastorino	2011-08-25	2	-1/+1
\|\ \ \