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

	Commit message (Expand)	Author	Age	Files	Lines
*	threads can wait on responses to be committed	Aaron Patterson	2012-07-27	3	-1/+34
*	Revert "Removing composed_of from ActiveRecord."	Rafael Mendonça França	2012-07-27	19	-32/+790
*	Merge pull request #7182 from yahonda/address_7178	Rafael Mendonça França	2012-07-27	1	-1/+1
\|\
\| *	Modity the :json_data_empty attribute from `:null => false` to `:null => true`	Yasuo Honda	2012-07-28	1	-1/+1
* \|	Merge pull request #7181 from jfirebaugh/rbx	Rafael Mendonça França	2012-07-27	1	-5/+1
\|\ \ \| \|/ \|/\|
\| *	Don't test language-level exception messages	John Firebaugh	2012-07-27	1	-5/+1
\|/
*	Merge pull request #6827 from zephyr-dev/master	José Valim	2012-07-27	5	-0/+118
\|\
\| *	AR has a subclass of AM:PresenceValidator.	Brent Wheeldon & Nick Monje	2012-07-20	5	-0/+118
* \|	Add Object#try! with the old NoMethodError raising behavior	David Heinemeier Hansson	2012-07-27	3	-2/+40
* \|	will now return nil instead of raise a NoMethodError if the receiving object...	David Heinemeier Hansson	2012-07-27	3	-5/+10
* \|	Changelog and doc updates for the previous changes.	Jon Leighton	2012-07-27	3	-24/+27
* \|	Deprecate Relation#all.	Jon Leighton	2012-07-27	6	-22/+9
* \|	Deprecate ActiveRecord::Base.scoped.	Jon Leighton	2012-07-27	42	-504/+497
* \|	ActiveRecord::Base.all returns a Relation.	Jon Leighton	2012-07-27	31	-324/+329
* \|	Only require the `:rails_env` task where is needed.	Rafael Mendonça França	2012-07-27	1	-12/+12
* \|	Merge pull request #7173 from yahonda/address_7138	Rafael Mendonça França	2012-07-26	1	-1/+1
\|\ \
\| * \|	Modify the preference attribute from `:null => false` to `:null => true`	Yasuo Honda	2012-07-27	1	-1/+1
\|/ /
* \|	* Do not convert digest auth strings to symbols. CVE-2012-3424	Aaron Patterson	2012-07-26	1	-2/+2
* \|	Merge pull request #7171 from beerlington/refactor_inheritance_base_class	Rafael Mendonça França	2012-07-26	3	-30/+45
\|\ \
\| * \|	Refactor ActiveRecord::Inheritance.base_class logic	beerlington	2012-07-26	3	-30/+45
* \| \|	Merge pull request #7170 from makaroni4/master	Rafael Mendonça França	2012-07-26	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix typo in documentation	Anatoly Makarevich	2012-07-26	2	-2/+2
\|/ /
* \|	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
\|/ / / / /