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

	Commit message (Expand)	Author	Age	Files	Lines
*	Tell the user which file is missing when config/database.yml was not found	Akira Matsuda	2014-09-10	2	-3/+13
*	Removed any default margin from body.	Sahil Lavingia	2014-09-09	1	-1/+5
*	Remove extra newline from ActiveJob test template	yuuji.yaginuma	2014-09-09	1	-1/+0
*	Dependencies: bump to jquery-rails 4.0.0.beta2	Godfrey Chan	2014-09-05	1	-1/+1
*	Use the released jquery-rails gem	Godfrey Chan	2014-09-05	1	-2/+8
*	world writable might be a bit too open...	Peter Schröder	2014-09-05	1	-1/+2
*	Change "For not..." to "Do not...".	Kale Worsley	2014-09-04	1	-1/+1
*	build fix, we have to reset the RACK_ENV as well.	Yves Senn	2014-09-04	1	-2/+5
*	Merge pull request #16775 from kaspth/ship-secure-sanitizer	Rafael Mendonça França	2014-09-03	1	-41/+0
\|\
\| *	Ship with rails-html-sanitizer instead.	Kasper Timm Hansen	2014-09-03	1	-41/+0
* \|	Merge pull request #16756 from huoxito/dont-mess-railties-default-order	Rafael Mendonça França	2014-09-03	2	-8/+45
\|\ \
\| * \|	Dont mess with default order engines load	Washington Luiz	2014-09-02	2	-8/+45
* \| \|	schema loading rake tasks maintain database connection for current env.	Yves Senn	2014-09-03	1	-0/+26
\| \|/ \|/\|
* \|	Merge pull request #16724 from seuros/testcase	Rafael Mendonça França	2014-09-02	1	-1/+2
\|\ \
\| * \|	[ActiveJob] TestCase	Abdelkader Boudih	2014-09-02	1	-1/+0
\| * \|	[ActiveJob] TestCase	Abdelkader Boudih	2014-09-02	1	-1/+3
* \| \|	Leave all our tests as order_dependent! for now	Matthew Draper	2014-09-02	1	-0/+4
\|/ /
* \|	Add test to assert the right sanitizer vendor is being used	Rafael Mendonça França	2014-09-01	1	-0/+41
* \|	Try with web-console master	Rafael Mendonça França	2014-09-01	1	-1/+1
* \|	Use jquery-rails master	Rafael Mendonça França	2014-09-01	1	-1/+1
* \|	Keep it closer to the original wording [ci skip]	Godfrey Chan	2014-08-31	1	-1/+1
* \|	Since /console is an optional feature, mention <%= console %> instead.	Rhett Sutphin	2014-08-31	1	-1/+1
\|/
*	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2014-08-29	20	-35/+93
\|\
\| *	Expectations first	Akira Matsuda	2014-08-28	4	-9/+9
\| *	Reset RACK_ENV after modified in a test case	Akira Matsuda	2014-08-28	1	-0/+1
\| *	Rails.root should be a Pathname	Akira Matsuda	2014-08-28	1	-1/+1
\| *	Fix spelling. [CI SKIP]	Guo Xiang Tan	2014-08-27	1	-1/+1
\| *	fix broken `gem` method with non-String arguments. Closes #16709.	Yves Senn	2014-08-27	3	-4/+23
\| *	show stats for app/jobs	yuuji.yaginuma	2014-08-24	1	-1/+2
\| *	[ActiveJob] Add hook for test_framework and test templates	Abdelkader Boudih	2014-08-22	2	-0/+22
\| *	Merge pull request #16622 from matthewd/default-debug	Matthew Draper	2014-08-23	2	-3/+3
\| \|\
\| \| *	Don't fight against ourselves for the default log level	Matthew Draper	2014-08-22	2	-3/+3
\| * \|	Merge pull request #16604 from saarons/clean-remote-ip-middleware	Jeremy Kemper	2014-08-21	1	-1/+15
\| \|\ \
\| \| * \|	Refactor ActionDispatch::RemoteIp	Sam Aarons	2014-08-21	1	-1/+15
\| \| \|/
\| * \|	fix grammar [ci skip]	Vijay Dev	2014-08-22	1	-1/+1
\| * \|	fix server names [ci skip]	Vijay Dev	2014-08-22	1	-1/+1
\| \|/
\| *	Make text consistent in help text of rails server and console commands.	Vijay Dev	2014-08-21	2	-13/+13
\| *	Remove timestamp type from generator usage	Rafael Mendonça França	2014-08-20	1	-1/+0
\| *	Require ActiveJob in case a skip_xxx option is given	slainer68	2014-08-20	2	-0/+2
\| *	remove end-of-line spacing in development.rb, production.rb	Nick Sinenko	2014-08-20	2	-2/+2
* \|	Preparing for 4.2.0.beta1 release	David Heinemeier Hansson	2014-08-19	1	-1/+1
\|/
*	Fix failing railties tests	Carlos Antonio da Silva	2014-08-19	1	-2/+6
*	Fix blank link on config/application.rb app template [ci skip]	Carlos Antonio da Silva	2014-08-19	1	-1/+1
*	Fix setting simple values to the new config.x	Carlos Antonio da Silva	2014-08-19	3	-11/+23
*	Point to right sass-rails version	Rafael Mendonça França	2014-08-19	1	-1/+1
*	Use web-console 2.0.0.beta2 on new apps	Guillermo Iguaran	2014-08-19	1	-1/+1
*	Revert "Improve custom configuration"	Rafael Mendonça França	2014-08-19	6	-126/+31
*	Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelog	Guillermo Iguaran	2014-08-19	1	-0/+7
\|\
\| *	Mention web-console in 4.2 release notes	Genadi Samokovarov	2014-08-20	1	-0/+7
* \|	We always get the value so no need to check nil or Hash	Rafael Mendonça França	2014-08-19	1	-6/+2