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

	Commit message (Expand)	Author	Age	Files	Lines
*	Make remote_ip detection properly handle private IPv6 addresses	Caleb Spare	2013-10-26	3	-2/+13
*	Merge pull request #12655 from rails/ps-remove-surprise-if-in-show-exception-...	Santiago Pastorino	2013-10-26	1	-2/+5
\|\
\| *	Remove surprise if from show_exception middleware	Prem Sichanugrist	2013-10-27	1	-2/+5
\|/
*	Merge pull request #12648 from chrisledet/patch-1	Rafael Mendonça França	2013-10-25	1	-2/+2
\|\
\| *	Fixed typo with after_commit docs	Chris Ledet	2013-10-25	1	-2/+2
\|/
*	Merge pull request #12643 from severin/pg_cast_json_on_write	Yves Senn	2013-10-25	3	-0/+26
\|\
\| *	cast json values on write to be consistent with reading from the db.	Severin Schoepke	2013-10-25	3	-0/+26
* \|	prevent `time_zone_aware_attributes` test leak. follow-up to #12633.	Yves Senn	2013-10-25	1	-21/+21
* \|	only warn on leaked time zone state instead of rasing an error.	Yves Senn	2013-10-25	1	-3/+6
* \|	Merge pull request #12633 from senny/no_more_time_zone_leaks	Yves Senn	2013-10-25	12	-214/+223
\|\ \ \| \|/ \|/\|
\| *	prevent global timezone state from leaking out of test cases.	Yves Senn	2013-10-25	12	-214/+223
* \|	Merge pull request #12642 from ka8725/fix_usage_for_model_generators	Rafael Mendonça França	2013-10-25	1	-1/+1
\|\ \
\| * \|	Improve usage example for model generator	Andrey Koleshko	2013-10-25	1	-1/+1
* \| \|	Merge pull request #12641 from jetthoughts/12640_updated_migrations_doc_to_us...	Rafael Mendonça França	2013-10-25	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix migration docs to use new remove_column semantics	Paul Nikitochkin	2013-10-25	1	-2/+2
* \| \|	Merge pull request #12490 from senny/store_accessor_hstore_bug	Yves Senn	2013-10-24	8	-14/+127
\|\ \ \
\| * \| \|	`ActiveRecord::Store` works together with PG `hstore` columns.	Yves Senn	2013-10-25	6	-14/+88
\| * \| \|	`stored_attributes` need to be specific to a subclass.	Yves Senn	2013-10-25	3	-0/+21
\| * \| \|	test to verify the `ActiveRecord::Store` behavior with PG's json type	Yves Senn	2013-10-25	1	-0/+18
\|/ / /
* \| \|	Merge pull request #12621 from laurocaetano/fix_has_one_association_with_prim...	Rafael Mendonça França	2013-10-24	3	-1/+24
\|\ \ \
\| * \| \|	Save association when primary key is manually set	laurocaetano	2013-10-24	3	-1/+24
* \| \| \|	Merge pull request #12636 from kongregate/dont_rescue_Exceptions	Rafael Mendonça França	2013-10-24	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Avoid unnecessary catching of Exception instead of StandardError (converting ...	stopdropandrew	2013-10-24	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Improve the test code for #8422	Rafael Mendonça França	2013-10-24	1	-4/+4
* \| \| \|	Merge pull request #8491 from igagnidz/master	Rafael Mendonça França	2013-10-24	1	-0/+10
\|\ \ \ \
\| * \| \| \|	Added test to ensure that DescendantsTracker does not leak memory on singleto...	Iuri Gagnidze	2012-12-09	1	-0/+10
* \| \| \| \|	Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods	Aaron Patterson	2013-10-24	1	-6/+3
\|\ \ \ \ \
\| * \| \| \| \|	always check to see if methods exist after calling define_attribute_methods	Matt Jones	2013-10-24	1	-6/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Add CHANGELOG entry for #12635 [ci skip]	Rafael Mendonça França	2013-10-24	1	-0/+4
* \| \| \| \|	Merge pull request #12635 from mperham/4-0-stable	Guillermo Iguaran	2013-10-24	1	-1/+0
* \| \| \| \|	Merge pull request #10471 from andyw8/button_to_params	Rafael Mendonça França	2013-10-24	3	-0/+19
\|\ \ \ \ \
\| * \| \| \| \|	Add params option for button_to	Andy Waite	2013-09-18	3	-0/+19
* \| \| \| \| \|	Merge pull request #12611 from antonio/slice_bang_honor_default_proc	Rafael Mendonça França	2013-10-24	3	-0/+24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	slice! should not remove default hash value/proc	Antonio Santos	2013-10-24	3	-0/+24
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Improve the CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-10-24	1	-10/+9
* \| \| \| \| \|	Merge pull request #12624 from timsly/master	Rafael Mendonça França	2013-10-24	1	-0/+16
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	update CHANGELOG	Tima Maslyuchenko	2013-10-24	1	-0/+16
\| \|/ / / /
* \| \| \| \|	Merge pull request #12629 from Peeja/has_many-pets-typo	Guillermo Iguaran	2013-10-24	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix typo: `has_many :pets`, not `pets :has_many`.	Peter Jaros	2013-10-24	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #12622 from timsly/helpers-from-outside	Guillermo Iguaran	2013-10-23	2	-1/+11
\|\ \ \ \
\| * \| \| \|	pass app config to controller helper proxy	Tima Maslyuchenko	2013-10-24	2	-1/+11
\|/ / / /
* \| \| \|	Merge pull request #12619 from Veraticus/fix_utils_normalize_path	Rafael Mendonça França	2013-10-23	2	-1/+9
\|\ \ \ \
\| * \| \| \|	Correct error in Utils.normalize_path that changed paths improperly	Josh Symonds	2013-10-23	2	-1/+9
* \| \| \| \|	Fix the install task	Rafael Mendonça França	2013-10-23	1	-9/+1
\|/ / / /
* \| \| \|	Merge pull request #12617 from skv-headless/master	Rafael Mendonça França	2013-10-23	1	-4/+3
\|\ \ \ \
\| * \| \| \|	[ci skip] second parameter of asset-url is depricated	Evgeniy	2013-10-23	1	-4/+3
* \| \| \| \|	Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_time_range...	Rafael Mendonça França	2013-10-23	3	-6/+34
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Let validates_inclusion_of accept Time and DateTime ranges	Akira Matsuda	2013-10-23	3	-6/+34
\|/ / / /
* \| \| \|	Try arel master	Rafael Mendonça França	2013-10-22	1	-0/+1
* \| \| \|	this should be private, no other instances of Root should call it	Aaron Patterson	2013-10-22	1	-1/+1