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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8338 from ugisozols/master	Carlos Antonio da Silva	2012-11-27	1	-2/+1
\|\
\| *	Fix Strong Parameters docs.	Uģis Ozols	2012-11-27	1	-2/+1
\|/
*	Merge pull request #8337 from amatsuda/unshift_html_scanner	Rafael Mendonça França	2012-11-27	1	-1/+1
\|\
\| *	unshift html-scanner into $LOAD_PATH rather than append	Akira Matsuda	2012-11-27	1	-1/+1
* \|	Merge pull request #8336 from rashmi14yadav/warning_removed	Carlos Antonio da Silva	2012-11-27	1	-1/+0
\|\ \ \| \|/ \|/\|
\| *	Unused variable warning removed	Rashmi Yadav	2012-11-27	1	-1/+0
\|/
*	Merge pull request #8333 from amatsuda/rails_gem_empty_require_path	José Valim	2012-11-27	1	-0/+1
\|\
\| *	rails gem has no lib directory to require	Akira Matsuda	2012-11-27	1	-0/+1
\|/
*	Remove warning of circular require	Rafael Mendonça França	2012-11-27	1	-1/+1
*	Remove useless check of AR being defined from teardown fixtures	Carlos Antonio da Silva	2012-11-27	1	-5/+4
*	Refactor generators tests to include test helpers in the parent class	Carlos Antonio da Silva	2012-11-27	1	-4/+3
*	Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master	Carlos Antonio da Silva	2012-11-26	3	-0/+15
\|\
\| *	Accept symbols as #send_data :disposition value	Elia Schito	2012-11-27	3	-0/+15
\|/
*	Merge pull request #7282 from xHire/validates_length_of_fix	Rafael Mendonça França	2012-11-26	3	-2/+57
\|\
\| *	Length validation handles correctly nil. Fix #7180	Michal Zima	2012-11-26	3	-2/+57
* \|	Merge pull request #8324 from steveklabnik/changelog_7997	Rafael Mendonça França	2012-11-26	1	-1/+1
\|\ \
\| * \|	@steveklabnik can't spell 'distance.'	Steve Klabnik	2012-11-26	1	-1/+1
* \| \|	Merge pull request #8323 from steveklabnik/changelog_7997	Rafael Mendonça França	2012-11-26	1	-0/+2
\|\\| \|
\| * \|	Add changelog for #7997.	Steve Klabnik	2012-11-26	1	-0/+2
\|/ /
* \|	Merge pull request #8319 from alindeman/typo	Carlos Antonio da Silva	2012-11-26	1	-1/+1
\|\ \
\| * \|	Corrects typo in test name	Andy Lindeman	2012-11-26	1	-1/+1
* \| \|	Merge pull request #8320 from senny/active_model_log_folder	Carlos Antonio da Silva	2012-11-26	1	-0/+1
\|\ \ \
\| * \| \|	log output from activemodel's railtie_test directly to STDOUT	Yves Senn	2012-11-26	1	-0/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #6197 from blakesmith/connection_adapters_without_explain_...	Xavier Noria	2012-11-26	3	-6/+24
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Don't run explain on slow queries for database adapters that don't support it	Blake Smith	2012-11-26	3	-6/+24
\|/ /
* \|	Merge pull request #8312 from senny/make_active_model_parts_individually_load...	Rafael Mendonça França	2012-11-26	9	-21/+14
\|\ \
\| * \|	cleanup, removed dispensable `require` statements from `ActiveModel`	Yves Senn	2012-11-25	8	-12/+5
\| * \|	cleanup, remove broken whitespace	Yves Senn	2012-11-25	4	-9/+9
* \| \|	Improve clarity of routing tests	Andrew White	2012-11-26	1	-634/+1081
* \| \|	Require active_model/railtie directly instead of rails/all	Carlos Antonio da Silva	2012-11-26	1	-3/+3
\| \|/ \|/\|
* \|	Merge pull request #8316 from roberto/assert_template_validate_options	Carlos Antonio da Silva	2012-11-26	3	-1/+11
\|\ \
\| * \|	assert_template: validating option keys	Roberto Soares	2012-11-25	3	-1/+11
* \| \|	Merge pull request #8317 from latortuga/cache-digest-opt-out	David Heinemeier Hansson	2012-11-26	3	-1/+38
\|\ \ \
\| * \| \|	Add explicit opt-out for fragment cache digesting	Drew Ulmer	2012-11-25	3	-1/+38
* \| \| \|	schema cache already has the columns as a hash, so use that	Aaron Patterson	2012-11-25	2	-2/+12
* \| \| \|	speed up fixture loading by querying the schema cache for column names	Aaron Patterson	2012-11-25	2	-2/+11
\| \|/ / \|/\| \|
* \| \|	Merge pull request #8302 from roberto/assert_template_empty_string	Carlos Antonio da Silva	2012-11-25	3	-1/+19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	`assert_template` fails with empty string.	Roberto Soares	2012-11-23	3	-9/+12
\| * \|	`assert_template` fails with empty string when a template has been rendered	Roberto Soares	2012-11-23	3	-4/+19
* \| \|	Merge pull request #8311 from alisdair/dirty-nullable-datetime	Carlos Antonio da Silva	2012-11-25	3	-0/+21
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Don't call will_change! for datetime nil->"".	Alisdair McDiarmid	2012-11-25	3	-0/+21
\|/ /
* \|	Merge pull request #8306 from senny/documentation_for_hidden_field_id	Carlos Antonio da Silva	2012-11-24	1	-0/+5
\|\ \
\| * \|	document :hidden_field_id option for fields_for	Yves Senn	2012-11-24	1	-0/+5
* \| \|	Fix changelog entry about fast_string_to_time fix	Carlos Antonio da Silva	2012-11-24	1	-2/+2
* \| \|	Refector a bit to remove extra slice iteration and splat call	Carlos Antonio da Silva	2012-11-24	1	-2/+2
* \| \|	Use merge! in some places to avoid creating extra hashes	Carlos Antonio da Silva	2012-11-24	2	-4/+4
* \| \|	Simplify scope options recovery by using merge!	Carlos Antonio da Silva	2012-11-24	1	-6/+1
* \| \|	Normalize scope recovering :blocks option name	Carlos Antonio da Silva	2012-11-24	1	-3/+3
* \| \|	Simplify constraints condition in scope when checking for Hash	Carlos Antonio da Silva	2012-11-24	1	-7/+4
* \| \|	Move initialize_copy method around to let new method / build alias closer	Carlos Antonio da Silva	2012-11-24	1	-8/+8
\| \|/ \|/\|