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

	Commit message (Expand)	Author	Age	Files	Lines
*	make events not use date and time to determine parent_of. fixes #5932	タコ焼き仮面	2012-06-18	3	-11/+42
*	Add CHANGELOG entry to composed_of removal	Rafael Mendonça França	2012-06-18	1	-0/+6
*	Merge pull request #6743 from steveklabnik/remove_composed_of	Rafael Mendonça França	2012-06-18	18	-768/+9
\|\
\| *	Removing composed_of from ActiveRecord.	Steve Klabnik	2012-06-18	18	-768/+9
* \|	Merge pull request #6772 from yahonda/reset_sequence_name_oracle	Rafael Mendonça França	2012-06-18	1	-0/+2
\|\ \ \| \|/ \|/\|
\| *	Add ensure Joke.reset_sequence_name	Yasuo Honda	2012-06-19	1	-0/+2
\|/
*	Merge branch 'eliminate_notice_messages'	Carlos Antonio da Silva	2012-06-18	5	-5/+15
\|\
\| *	Change minimum (default) log level in PostgreSQL to warning.	kennyj	2012-06-18	5	-5/+15
\|/
*	Require thor 0.15.3 onwards	José Valim	2012-06-18	2	-5/+2
*	Merge branch 'dp_docs'	Carlos Antonio da Silva	2012-06-18	1	-0/+92
\|\
\| *	Documentation for where and where! methods on relations.	David Paschich	2012-06-18	1	-0/+92
* \|	Merge pull request #6767 from frodsan/fix_sqlite_rake_tests	Rafael Mendonça França	2012-06-17	4	-6/+9
\|\ \
\| * \|	fix invalid syntax and sqlite rake failing tests	Francesco Rodriguez	2012-06-18	4	-6/+9
\|/ /
* \|	Merge pull request #6766 from frodsan/refactor_db_tasks	Rafael Mendonça França	2012-06-17	4	-208/+226
\|\ \
\| * \|	add :nodoc: to AR::Tasks and update to follow the coding conventions	Francesco Rodriguez	2012-06-18	4	-208/+226
\|/ /
* \|	Merge pull request #6765 from frodsan/fix_build_railties	Rafael Mendonça França	2012-06-17	1	-3/+3
\|\ \
\| * \|	check if sqlite3 file exists before remove	Francesco Rodriguez	2012-06-18	1	-3/+3
\|/ /
* \|	Merge pull request #6761 from freelancing-god/db-rake	Jon Leighton	2012-06-17	10	-156/+983
\|\ \
\| * \|	Rails is the default (but now override able) source for environment and path.	Pat Allan	2012-06-17	4	-43/+57
\| * \|	Cleaning up after some warnings, adding slightly higher-level tests.	Pat Allan	2012-06-17	6	-9/+309
\| * \|	One line db:create/db:drop tasks.	Pat Allan	2012-06-17	2	-55/+50
\| * \|	db:drop and some of db:test:purge.	Pat Allan	2012-06-17	8	-52/+243
\| * \|	db:create for PostgreSQL pulled out into a class.	Pat Allan	2012-06-17	6	-36/+99
\| * \|	db:create for MySQL now much cleaner.	Pat Allan	2012-06-17	6	-37/+230
\| * \|	Confirm connection is not established if file exists.	Pat Allan	2012-06-17	1	-1/+10
\| * \|	A beginning of sorts.	Pat Allan	2012-06-17	4	-12/+74
* \| \|	Merge pull request #6762 from frodsan/patch-3	José Valim	2012-06-17	1	-2/+2
\|\ \ \
\| * \| \|	bump AS deprecation_horizon to 4.1	Francesco Rodríguez	2012-06-17	1	-2/+2
\|/ / /
* \| \|	Merge pull request #6760 from kennyj/bump_20120617	Santiago Pastorino	2012-06-17	2	-2/+2
\|\ \ \
\| * \| \|	Bump tzinfo gem.	kennyj	2012-06-17	2	-2/+2
* \| \| \|	Merge pull request #6759 from dylanahsmith/only-catch-standard-error	Santiago Pastorino	2012-06-17	5	-8/+8
\|\ \ \ \
\| * \| \| \|	Avoid unnecessary catching of Exception instead of StandardError.	Dylan Smith	2012-06-17	5	-8/+8
* \| \| \| \|	Merge pull request #6758 from caironoleto/master	José Valim	2012-06-17	1	-14/+14
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * / /	Adding `load_config` task as dependency.	Cairo Noleto	2012-06-16	1	-14/+14
\|/ / /
* \| \|	Merge pull request #6755 from kennyj/remove_csv_support	Rafael Mendonça França	2012-06-16	2	-1/+13
\|\ \ \
\| * \| \|	Don't read csv file during executing db:fixtures:load.	kennyj	2012-06-17	2	-1/+13
\|/ / /
* \| \|	Merge pull request #6752 from steveklabnik/fix_5680	Rafael Mendonça França	2012-06-16	3	-4/+21
\|\ \ \
\| * \| \|	Respect absolute paths in compute_source_path.	Steve Klabnik	2012-06-16	3	-4/+21
* \| \| \|	Merge pull request #6753 from schnittchen/patch-1	José Valim	2012-06-16	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Documentation: make it clearer that subscribers are not notified asynchronous...	Schnittchen	2012-06-16	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #6748 from marcandre/dasherize_doc	Rafael Mendonça França	2012-06-15	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix doc example for dasherize	Marc-Andre Lafortune	2012-06-15	1	-1/+1
\|/ / / /
* \| \| \|	TestCase does not need to be loaded when loading the framework	Aaron Patterson	2012-06-15	2	-2/+13
* \| \| \|	no need to define methods in included hook	Jon Leighton	2012-06-15	1	-13/+13
* \| \| \|	Fix deprecation warnings when using config.active_record.mass_assignment_sani...	Jon Leighton	2012-06-15	2	-3/+40
* \| \| \|	Fix observers with AR::Model	Jon Leighton	2012-06-15	4	-3/+27
* \| \| \|	Fix config.active_record.whitelist_attributes with AR::Model	Jon Leighton	2012-06-15	4	-6/+44
* \| \| \|	Simplify AR configuration code.	Jon Leighton	2012-06-15	31	-567/+356
* \| \| \|	refactor	Jon Leighton	2012-06-15	1	-11/+5
* \| \| \|	Merge pull request #6646 from kennyj/fix_3470	Carlos Antonio da Silva	2012-06-15	7	-3/+35
\|\ \ \ \ \| \|/ / / \|/\| \| \|