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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use the released gem	Rafael Mendonça França	2015-03-10	1	-8/+2
\|
*	Let strip_tags leave HTML escaping to Rails.	Kasper Timm Hansen	2015-03-10	1	-4/+10
\| \| \| \|	Prevents double escaping errors, such as "&" becoming "&amp;".
*	Fixed ActiveJob integration tests	Cristian Bica	2015-03-05	1	-0/+4
\|
*	Test against the mail gem's edge	Robin Dupret	2015-03-02	1	-2/+8
\| \| \| \| \| \| \| \| \| \|	The edge version ships with a patch that uses composition over inheritance for the Mail::PartsList object (see mikel/mail#782). Let's test Action Mailer against it to prevent eventual regressions and experience it. Moreover, this branch makes the Action Mailer suite green against Rubinius.
*	Bump rack-test to fix nil values being sent to `parse_nested_query`	eileencodes	2015-03-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	I found that nil values were being incorrectly sent to `parse_nested_query` in Rack. Originally it was thought that Rails was doing something incorrect but it was actually rack-test. This was fixed in brynary/rack-test@4a4b2c1 and is no longer an issue. This commit bumps rack-test in Rails so changes to Rack don't cause failures. See rack/rack#813 for more information.
*	Format the time string according to the precision of the time column	Ryuta Kamizono	2015-02-20	1	-1/+1
\| \| \| \|	It is also necessary to format a time column like a datetime column.
*	Track Gemfile.lock at the repository	Rafael Mendonça França	2015-02-18	1	-0/+281
	The main reason is to make bisect easier. In some points, we have a lot of git dependencies. Since we don't have the information of which commit we are referring to, bundler get the latest commit of the master branch of the dependency. This sometimes returns a version that is not compatible with Rails anymore, making the tests fail and the harder to identify the commit that introduced a bug. Also this will make sure that a contributor will always get a set of dependencies that are passing with our tests. In our CI server we delete the lock file to make sure we are always testing against the newest release of our dependencies.