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

	Commit message (Expand)	Author	Age	Files	Lines
*	Refactor ActiveRecord::Inheritance.base_class logic	beerlington	2012-07-26	3	-30/+45
*	Merge pull request #7167 from route/missed_extend	José Valim	2012-07-26	1	-0/+1
\|\
\| *	Missed extend for eager_autoload	Dmitry Vorotilin	2012-07-26	1	-0/+1
\|/
*	Merge pull request #7166 from ayrton/patch-1	Jon Leighton	2012-07-26	1	-13/+13
\|\
\| *	Update activerecord/CHANGELOG.md	Ayrton De Craene	2012-07-26	1	-13/+13
* \|	Merge pull request #7161 from michaelfairley/eager_load_active_record_associa...	Jon Leighton	2012-07-26	1	-5/+7
\|\ \ \| \|/ \|/\|
\| *	Eager autoload ActiveRecord association helpers	Michael Fairley	2012-07-25	1	-5/+7
* \|	Merge pull request #7165 from parndt/patch-5	Rafael Mendonça França	2012-07-25	1	-1/+1
\|\ \
\| * \|	Switched update_column recommendation in changelog to update_columns	Philip Arndt	2012-07-26	1	-1/+1
\|/ /
* \|	Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2	Aaron Patterson	2012-07-25	3	-1/+76
\|\ \
\| * \|	Stop being silly with formatting of method aliasing.	Steve Jorgensen	2012-07-16	1	-3/+3
\| * \|	Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.	Steve Jorgensen	2012-07-16	3	-0/+75
\| * \|	Don't crash exception translation w/ nil result attribute.	Steve Jorgensen	2012-07-16	1	-1/+1
* \| \|	Merge pull request #7158 from yahonda/use_string_for_settings	Rafael Mendonça França	2012-07-25	1	-1/+1
\|\ \ \
\| * \| \|	Use string datatype for the setting attribute	Yasuo Honda	2012-07-26	1	-1/+1
\|/ / /
* \| \|	Merge pull request #7151 from graceliu/travis-rm-dup-run	Carlos Antonio da Silva	2012-07-24	1	-3/+0
\|\ \ \
\| * \| \|	remove duplicate build runs in travis. These extra runs were used to	Grace Liu	2012-07-24	1	-3/+0
\|/ / /
* \| \|	Merge branch 'update_columns'	Rafael Mendonça França	2012-07-24	16	-63/+212
\|\ \ \
\| * \| \|	Deprecate update_column in favor of update_columns.	Rafael Mendonça França	2012-07-24	15	-47/+85
\| * \| \|	Use update_columns to implemente the update_column	Rafael Mendonça França	2012-07-24	2	-19/+54
\| * \| \|	New #update_columns method.	Sebastian Martinez	2012-07-24	3	-0/+76
\|/ / /
* \| \|	Merge pull request #7148 from yahonda/address_6195	Rafael Mendonça França	2012-07-24	1	-1/+1
\|\ \ \
\| * \| \|	This pull requests addresses ORA-01400 errors and also supports #6115 issue t...	Yasuo Honda	2012-07-25	1	-1/+1
* \| \| \|	Merge pull request #7150 from lucasmazza/flush_option	Rafael Mendonça França	2012-07-24	2	-13/+13
\|\ \ \ \
\| * \| \| \|	Replace the flush parameter with a Hash.	Lucas Mazza	2012-07-24	2	-13/+13
\|/ / / /
* \| \| \|	Merge pull request #6991 from frodsan/performance_test_generator	Rafael Mendonça França	2012-07-24	2	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	update performance test template to use test method	Francesco Rodriguez	2012-07-06	2	-2/+2
* \| \| \|	Merge pull request #7143 from accessd/fix-typo-callbacks-test	Santiago Pastorino	2012-07-24	1	-2/+2
\|\ \ \ \
\| * \| \| \|	fix typo in callbacks test	Accessd	2012-07-24	1	-2/+2
\|/ / / /
* \| \| \|	Add CHANGELOG entry	Santiago Pastorino	2012-07-23	1	-0/+2
* \| \| \|	Remove ActionDispatch::Head middleware in favor of Rack::Head	Santiago Pastorino	2012-07-23	7	-32/+12
* \| \| \|	Merge pull request #7137 from kennyj/fix_installing_problem_journey	Rafael Mendonça França	2012-07-23	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix build. Bump Journey requirements to 2.0.0.	kennyj	2012-07-24	1	-1/+1
\|/ / / /
* \| \| \|	Bump Journey requirements to 1.0.4	Andrew White	2012-07-23	1	-1/+1
* \| \| \|	Add one more test case to make sure that data attributes are being	Rafael Mendonça França	2012-07-22	1	-0/+7
* \| \| \|	Merge pull request #7130 from kennyj/fix_restoring_query_cache	Rafael Mendonça França	2012-07-22	2	-4/+22
\|\ \ \ \
\| * \| \| \|	Restore connection_id on error.	kennyj	2012-07-23	2	-4/+22
* \| \| \| \|	Merge pull request #7123 from nashby/data-in-options	Rafael Mendonça França	2012-07-22	2	-8/+15
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	don't escape options in option_html_attributes method	Vasiliy Ermolovich	2012-07-22	2	-8/+15
* \| \| \| \|	Merge pull request #7126 from frodsan/fix_nodoc_encoding	Rafael Mendonça França	2012-07-21	1	-15/+48
\|\ \ \ \ \
\| * \| \| \| \|	fixing :nodoc:s in AS::JSON::Encoding	Francesco Rodriguez	2012-07-21	1	-15/+48
\|/ / / / /
* \| \| \| \|	Remove deprecation warnings	Carlos Galdino + Rafael Mendonça França	2012-07-21	2	-2/+2
* \| \| \| \|	Add back `:disable_with` and change deprecation horizon to 4.1	Carlos Galdino + Rafael Mendonça França	2012-07-21	5	-5/+74
* \| \| \| \|	Add back `:confirm` and change deprecation horizon to 4.1	Carlos Galdino + Rafael Mendonça França	2012-07-21	5	-2/+144
* \| \| \| \|	+"foo"+ doesn't generate code tag [ci skip]	Rafael Mendonça França	2012-07-21	1	-1/+1
* \| \| \| \|	Lets be consistent with whitespaces at documentation	Rafael Mendonça França	2012-07-21	1	-13/+13
* \| \| \| \|	Copy-edits at Rails::Queueing documentation	Rafael Mendonça França	2012-07-21	1	-2/+2
* \| \| \| \|	update 4.0 release notes [ci skip]	Vijay Dev	2012-07-21	1	-0/+2
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-07-21	7	-27/+108
\|\ \ \ \ \
\| * \| \| \| \|	improve NullRelation docs [ci skip]	Vijay Dev	2012-07-21	2	-5/+4