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

	Commit message (Expand)	Author	Age	Files	Lines
*	fix typo in transaction argument. Closes #19265.	Yves Senn	2015-03-11	1	-1/+1
*	Merge pull request #19280 from palkan/fix-pg-json-test	Yves Senn	2015-03-11	1	-0/+1
\|\
\| *	Fix json_test	palkan	2015-03-11	1	-0/+1
\|/
*	Use the released gem	Rafael Mendonça França	2015-03-10	2	-10/+2
*	Merge pull request #19252 from kaspth/single-escaping-strip-tags	Rafael Mendonça França	2015-03-10	6	-7/+19
\|\
\| *	Let strip_tags leave HTML escaping to Rails.	Kasper Timm Hansen	2015-03-10	6	-7/+19
* \|	Add YAML compatibility for objects from Rails 4.2	Sean Griffin	2015-03-10	4	-27/+239
* \|	Attempt to provide backwards compatible YAML deserialization	Sean Griffin	2015-03-10	4	-0/+76
* \|	Merge pull request #19275 from keepcosmos/remove-autoload-path	Rafael Mendonça França	2015-03-10	1	-16/+16
\|\ \
\| * \|	remove unnecessary path parameters	keepcosmos	2015-03-10	1	-16/+16
* \| \|	Merge pull request #19273 from Gaurav2728/gaurav-remove_test_after_commit_gem...	Arthur Nogueira Neves	2015-03-10	1	-5/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	‘test_after_commit’ gem is not required in Rails 5 remove note from doc	Gaurav Sharam	2015-03-10	1	-5/+3
\|/ /
* \|	Merge pull request #19270 from AndrewHendrie/master	Zachary Scott	2015-03-09	1	-1/+1
\|\ \
\| * \|	Changed 'blank space' to 'blank line'	Andrew Hendrie	2015-03-09	1	-1/+1
\|/ /
* \|	Fix intermittent test failures	Sean Griffin	2015-03-09	1	-0/+1
* \|	Call super last in before_setup	eileencodes	2015-03-09	2	-1/+13
* \|	Revert "Revert integration test refactoring that caused app test regressions"	eileencodes	2015-03-09	2	-18/+10
* \|	Merge pull request #19243 from yui-knk/fix/require	Rafael Mendonça França	2015-03-09	2	-1/+1
\|\ \
\| * \|	Fix place of require 'rails_guides/markdown'	yui-knk	2015-03-07	2	-1/+1
* \| \|	Fix intermittent test failures	Sean Griffin	2015-03-09	1	-0/+1
* \| \|	Merge pull request #19264 from y-yagi/plugins_guide	Arthur Nogueira Neves	2015-03-09	1	-3/+3
\|\ \ \
\| * \| \|	use public Module#include instead of send :include [ci skip]	yuuji.yaginuma	2015-03-09	1	-3/+3
* \| \| \|	Revert "Take DST into account when locating TimeZone from Numeric."	Andrew White	2015-03-09	3	-24/+1
\|/ / /
* \| \|	Merge pull request #19263 from splattael/target-2.2.1	Yves Senn	2015-03-09	9	-9/+9
\|\ \ \
\| * \| \|	Target Ruby 2.2.1 in gemspecs	Peter Suschlik	2015-03-09	9	-9/+9
\|/ / /
* \| \|	Merge pull request #19257 from jvanbaarsen/patch-1	Eileen M. Uchitelle	2015-03-08	1	-1/+1
\|\ \ \
\| * \| \|	Rails 5.0 needs ruby 2.2.1 or higher	Jeroen van Baarsen	2015-03-08	1	-1/+1
\|/ / /
* \| \|	Merge pull request #18200 from brainopia/rollback_frozen_records	Arthur Nogueira Neves	2015-03-07	2	-1/+21
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix transaction state for unsynced records when entering transaction	brainopia	2015-03-04	2	-0/+10
\| * \|	Fix rollback of frozen records	brainopia	2015-03-04	2	-1/+11
* \| \|	Merge pull request #19247 from wazery/doc_fix	Eileen M. Uchitelle	2015-03-07	4	-4/+4
\|\ \ \
\| * \| \|	Doc fixes [ci skip]	Islam Wazery	2015-03-07	4	-4/+4
\|/ / /
* \| \|	Merge pull request #19246 from wazery/patch-1	Robin Dupret	2015-03-07	1	-7/+7
\|\ \ \
\| * \| \|	Doc fix [ci skip]	Islam Wazery	2015-03-07	1	-7/+7
\|/ / /
* \| \|	Merge pull request #19242 from y-yagi/integration_test_example	Kasper Timm Hansen	2015-03-07	1	-7/+8
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	update integration test example as is not output deprecation warning [ci skip]	yuuji.yaginuma	2015-03-07	1	-7/+8
\|/ /
* \|	Merge pull request #19241 from yui-knk/fix/comment	Richard Schneeman	2015-03-06	1	-2/+2
\|\ \
\| * \|	[ci skip] Fix `AS` and `AR` to full name	yui-knk	2015-03-07	1	-2/+2
\|/ /
* \|	Merge pull request #19234 from sivsushruth/doc_fix	Kasper Timm Hansen	2015-03-07	1	-1/+1
\|\ \
\| * \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-07	1	-1/+1
* \| \|	Merge pull request #19231 from prathamesh-sonpatki/fix-url-for-documentation	Guillermo Iguaran	2015-03-06	1	-1/+4
\|\ \ \
\| * \| \|	Fix documentation of url_for module [ci skip]	Prathamesh Sonpatki	2015-03-06	1	-1/+4
* \| \| \|	Merge pull request #19233 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-06	1	-1/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-06	1	-1/+1
* \| \| \|	Fix leaky `only: …` option for Active Job assertions	Jeremy Kemper	2015-03-06	2	-9/+23
* \| \| \|	Merge pull request #19230 from prathamesh-sonpatki/fix-clear-doc	Robin Dupret	2015-03-06	1	-0/+3
\|\ \ \ \
\| * \| \| \|	Updated documentation of CollectionProxy#clear [ci skip]	Prathamesh Sonpatki	2015-03-06	1	-0/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #19221 from matthewd/random-tests	Matthew Draper	2015-03-06	10	-37/+4
\|\ \ \ \
\| * \| \| \|	Revert "For now, we will keep sorting the tests."	Matthew Draper	2015-03-06	4	-7/+4
\| * \| \| \|	Revert "Leave all our tests as order_dependent! for now"	Matthew Draper	2015-03-06	6	-30/+0