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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #16132 from tgxworld/fix_test_not_unsubscribing	Santiago Pastorino	2014-07-11	1	-2/+2
\|\
\| *	Fix incorrect unsubscription.	Guo Xiang Tan	2014-07-11	1	-2/+2
* \|	Merge pull request #16133 from Agis-/cookie_overflow_check	Santiago Pastorino	2014-07-11	2	-2/+7
\|\ \
\| * \|	Use `#bytesize` instead of `#size` when checking for cookie overflow	Agis-	2014-07-11	2	-2/+7
\|/ /
* /	Synced 4.2 release notes with the latest commits.	Godfrey Chan	2014-07-11	5	-30/+85
\|/
*	Fixed borken tests in AV caused by 013c74d	Godfrey Chan	2014-07-10	1	-2/+2
*	Merge pull request #14883 from chancancode/rm-single-space	Guillermo Iguaran	2014-07-10	6	-22/+32
\|\
\| *	Removed single space padding from empty response body.	Godfrey Chan	2014-07-10	6	-22/+32
\|/
*	* gcampbell-rosetta_flash:	Aaron Patterson	2014-07-10	4	-3/+8
\|\
\| *	Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcamp...	Aaron Patterson	2014-07-10	4	-3/+8
\|/\|
\| *	Address CVE-2014-4671 (JSONP Flash exploit)	Greg Campbell	2014-07-09	4	-3/+8
* \|	Merge pull request #16123 from karlentwistle/issues/9299	Andrew White	2014-07-10	3	-5/+21
\|\ \
\| * \|	Force encoding of US-ASCII to UTF-8 in unescape_uri.	Karl Entwistle	2014-07-10	3	-5/+21
\|/ /
* \|	Merge pull request #16118 from JayK31/strong_params_link	Zachary Scott	2014-07-09	1	-2/+1
\|\ \
\| * \|	[ci skip] Fixed link to strong params in Getting Started section 5.6.	JayK31	2014-07-09	1	-2/+1
\|/ /
* \|	Merge pull request #16113 from egilburg/rails_4_1_upgrade_guide_json_time_wit...	Zachary Scott	2014-07-09	1	-2/+12
\|\ \
\| * \|	[ci skip] Document millisecond precision change in ActiveSupport::TimeWithZon...	Eugene Gilburg	2014-07-09	1	-2/+12
\| \|/
* \|	Merge pull request #16091 from tgxworld/reduce_creation_of_subscribers	Santiago Pastorino	2014-07-09	1	-17/+13
\|\ \
\| * \|	Reduce number of subscriptions created.	Guo Xiang Tan	2014-07-08	1	-17/+13
* \| \|	Include missing module in tag_helper	Carlos Antonio da Silva	2014-07-09	1	-0/+1
\| \|/ \|/\|
* \|	Merge pull request #16103 from JuanitoFatas/doc/patch-001	Matthew Draper	2014-07-09	1	-34/+41
\|\ \
\| * \|	[ci skip] Fix 4.2 release notes list items. [Matthew Draper & Juanito Fatas]	Juanito Fatas	2014-07-09	1	-34/+41
\|/ /
* \|	Merge pull request #16102 from JuanitoFatas/format-fixes	Zachary Scott	2014-07-09	1	-31/+29
\|\ \
\| * \|	[ci skip] Fix 4.2 release notes rendered display.	Juanito Fatas	2014-07-09	1	-31/+29
* \| \|	Merge pull request #16100 from tgxworld/fix_comment	Zachary Scott	2014-07-09	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix weird comment. [CI SKIP]	Guo Xiang Tan	2014-07-09	1	-2/+2
\|/ /
* \|	Merge pull request #16097 from nishantmodak/correct_md	Zachary Scott	2014-07-08	12	-33/+29
\|\ \
\| * \|	correct markdown usage [ci skip]	Nishant Modak	2014-07-09	12	-33/+29
* \| \|	Merge pull request #13999 from jamox/update_rack	Aaron Patterson	2014-07-08	7	-22/+34
\|\ \ \
\| * \| \|	Since upgrading rack we can remove unnecessary string encodings	Jarmo Isotalo	2014-05-19	1	-9/+2
\| * \| \|	Upgraded rack	Jarmo Isotalo	2014-05-19	6	-13/+32
* \| \| \|	Merge pull request #16095 from eileencodes/update-changelog-for-pr-14899	Rafael Mendonça França	2014-07-08	1	-0/+15
\|\ \ \ \
\| * \| \| \|	[ci skip] Add changelog for PR #14899	eileencodes	2014-07-08	1	-0/+15
\|/ / / /
* \| \| \|	Merge pull request #16094 from zuhao/refactor_activerecord_belongs_to_associa...	Rafael Mendonça França	2014-07-08	1	-0/+2
\|\ \ \ \
\| * \| \| \|	Include fixtures to prevent foreign key violation.	Zuhao Wan	2014-07-09	1	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #16093 from zuhao/refactor_activerecord_nested_through_ass...	Rafael Mendonça França	2014-07-08	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Warm up cache to prevent assertion failure.	Zuhao Wan	2014-07-08	1	-0/+1
* \| \| \| \|	Merge pull request #16071 from sgrif/sg-pg-type-cast	Rafael Mendonça França	2014-07-08	1	-15/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove PG's definition of `type_cast`	Sean Griffin	2014-07-06	1	-15/+0
* \| \| \| \| \|	Merge pull request #16072 from sgrif/sg-xml-quoting	Rafael Mendonça França	2014-07-08	5	-5/+56
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Don't rely on the sql type to quote XML columns in PG	Sean Griffin	2014-07-06	5	-5/+56
\| \|/ / / /
* \| \| \| \|	test i18n against a routed app	Aaron Patterson	2014-07-07	1	-1/+16
* \| \| \| \|	remove the mounted_helpers respond_to check	Aaron Patterson	2014-07-07	1	-1/+1
* \| \| \| \|	always test against a routed rack app so there are always url_helpers	Aaron Patterson	2014-07-07	5	-36/+66
* \| \| \| \|	Merge pull request #16078 from tgxworld/retreive_connection_once	Rafael Mendonça França	2014-07-07	1	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	Avoid retrieving connection in ActiveRecord::QueryCache multiple times.	Guo Xiang Tan	2014-07-07	1	-2/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #16074 from sgrif/sg-remove-text-predicate	Rafael Mendonça França	2014-07-07	18	-32/+4
\|\ \ \ \ \
\| * \| \| \| \|	Remove the `text?` predicate from the type objects	Sean Griffin	2014-07-06	18	-32/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #16086 from nickpellant/master	Eileen M. Uchitelle	2014-07-07	1	-0/+14
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Improve callback code example for 4.1 upgrade docs.	Nick Pellant	2014-07-07	1	-4/+4