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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove extra test case.	Mike Gehard	2012-06-19	1	-7/+4
*	Merge pull request #6779 from simonjefford/db-rake-charset	Carlos Antonio da Silva	2012-06-19	9	-20/+118
\|\
\| *	Refactor db:charset task	Simon Jefford	2012-06-19	9	-20/+118
\|/
*	Merge pull request #6777 from route/logger_in_metal_tests	Carlos Antonio da Silva	2012-06-19	1	-0/+17
\|\
\| *	Added test for case when view doesn't have logger method when using ActionCon...	Dmitry Vorotilin	2012-06-19	1	-0/+17
* \|	Merge pull request #6776 from raggi/cache_control	José Valim	2012-06-18	2	-10/+44
\|\ \ \| \|/ \|/\|
\| *	Ensure that cache-control headers are merged	James Tucker	2012-06-18	2	-10/+44
* \|	Merge branch 'acapilleri-update_nested_attributes'	Rafael Mendonça França	2012-06-19	2	-5/+25
\|\ \
\| * \|	Refactor the conditionals	Rafael Mendonça França	2012-06-19	1	-7/+7
\| * \|	Validates_numericality_of is skipped when changing 0 to to non-empty string	Angelo capilleri	2012-06-19	2	-5/+25
\|/ /
* \|	Merge pull request #5412 from tilsammans/stored_attributes	Carlos Antonio da Silva	2012-06-18	3	-2/+32
\|\ \
\| * \|	Refactor and use class_attribute	Carlos Antonio da Silva	2012-06-18	2	-7/+15
\| * \|	Remember the stored attributes in a config attribute.	Joost Baaij	2012-06-18	3	-1/+23
\|/ /
* \|	Improve the CHANGELOG entry [ci skip]	Rafael Mendonça França	2012-06-18	1	-2/+19
* \|	Merge branch 'hash_with_indifferent_access_fix'	Carlos Antonio da Silva	2012-06-18	2	-1/+9
\|\ \
\| * \|	Use map! instead of replace + map	Carlos Antonio da Silva	2012-06-18	1	-1/+1
\| * \|	Fix lookup on HashWithIndifferentAccess for array values.	Chris Zetter	2012-06-18	2	-1/+9
\|/ /
* \|	Refactor Relation#update a bit to avoid an extra Enumerator instance	Carlos Antonio da Silva	2012-06-18	1	-1/+1
* \|	Make DatabaseTasks a module with real private methods	Carlos Antonio da Silva	2012-06-18	1	-13/+14
* \|	Merge pull request #6775 from takoyakikamen/events	Aaron Patterson	2012-06-18	3	-11/+42
\|\ \ \| \|/ \|/\|
\| *	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