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

	Commit message (Expand)	Author	Age	Files	Lines
*	Prepare for RC: un-wip release notes [ci skip]	Godfrey Chan	2014-11-25	1	-1/+0
*	We shouldn't be linking to edgeapi [ci skip]	Godfrey Chan	2014-11-25	1	-1/+1
*	Prepare for RC: link to the 4-2-stable [ci skip]	Godfrey Chan	2014-11-25	2	-3/+3
*	Cross link to upgrade guide [ci skip]	Godfrey Chan	2014-11-25	1	-1/+2
*	Merge branch 'nil_script_name'	Santiago Pastorino	2014-11-25	2	-1/+8
\|\
\| *	Add regression test case to ensure script_name as nil is not used anymore in ...	Santiago Pastorino	2014-11-25	1	-0/+7
\| *	sets script_name to always be a string.	JONBRWN	2014-11-25	1	-1/+1
\|/
*	Final sync with CHANGELOGs [ci skip]	Godfrey Chan	2014-11-25	1	-2/+7
*	:scissors: TODO	Godfrey Chan	2014-11-25	1	-4/+3
*	The default hasn't changed, so this is not an incompatibility [ci skip]	Godfrey Chan	2014-11-25	1	-16/+0
*	Simplify section on adequate record [ci skip]	Godfrey Chan	2014-11-25	1	-14/+14
*	Added tests for log_level deprecation	Godfrey Chan	2014-11-25	1	-13/+18
*	Set the test_order in the basic app as well, see 58e8b48	Godfrey Chan	2014-11-25	2	-0/+26
*	Set the default log_level to info in all tests	Godfrey Chan	2014-11-25	1	-0/+1
*	Merge pull request #17763 from kamipo/fix_out_of_range_error_message	Godfrey Chan	2014-11-25	1	-1/+1
\|\
\| *	Fix out of range error message	Ryuta Kamizono	2014-11-25	1	-1/+1
\|/
*	Merge pull request #17757 from zzak/railties-default-to-debug-log_level	Godfrey Chan	2014-11-25	1	-0/+1
\|\
\| *	Always default the log_level to :info for Railties	Zachary Scott	2014-11-24	1	-0/+1
* \|	Mention log_level deprecation in upgrade guides [ci skip]	Godfrey Chan	2014-11-25	1	-0/+12
* \|	Merge pull request #17755 from zzak/changelog-for-16622	Godfrey Chan	2014-11-25	2	-0/+7
\|\ \
\| * \|	Add Release Note for #16622 [ci skip]	Zachary Scott	2014-11-24	1	-0/+3
\| * \|	Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]	Zachary Scott	2014-11-24	1	-0/+4
\| \|/
* \|	let the AM test suite pass in 1.9	Xavier Noria	2014-11-24	1	-2/+2
* \|	Merge pull request #17760 from zzak/release-not-for-17743	Sean Griffin	2014-11-24	1	-0/+13
\|\ \
\| * \|	Add release note for #17743 [ci skip]	Zachary Scott	2014-11-24	1	-0/+13
\|/ /
* \|	Merge pull request #17687 from fabiolnm/master	Rafael Mendonça França	2014-11-25	2	-20/+52
\|\ \
\| * \|	Add perform_enqueued_jobs	Fábio Luiz Nery de Miranda	2014-11-25	2	-20/+52
\|/ /
* \|	Changelog format	Sean Griffin	2014-11-24	1	-2/+3
* \|	Merge branch 'deprecate-string-options-in-url-helpers'	Sean Griffin	2014-11-24	3	-1/+43
\|\ \
\| * \|	Deprecate string options in URL helpers	Melanie Gilman	2014-11-24	3	-1/+43
* \| \|	Merge pull request #17758 from tgxworld/mailer_generator	Rafael Mendonça França	2014-11-25	6	-31/+68
\|\ \ \
\| * \| \|	Update docs to reflect changes to MailerGenerator.	Guo Xiang Tan	2014-11-25	2	-22/+43
\| * \| \|	Add missing CHANGELOG entry.	Guo Xiang Tan	2014-11-25	1	-0/+7
\| * \| \|	Generate mailer layouts even if no action is given.	Guo Xiang Tan	2014-11-25	2	-4/+6
\| * \| \|	MailerGenerator should inherit from Base.	Guo Xiang Tan	2014-11-25	1	-3/+4
\| * \| \|	Add tests which were incorrectly removed.	Guo Xiang Tan	2014-11-25	3	-4/+10
\|/ / /
* \| \|	Merge pull request #17646 from andyjeffries/html_layout_fix	David Heinemeier Hansson	2014-11-25	8	-12/+54
\|\ \ \
\| * \| \|	Removing unnecessary File.join calls	Andy Jeffries	2014-11-24	2	-2/+2
\| * \| \|	Creates an ApplicationMailer and layout by default, including html and body t...	Andy Jeffries	2014-11-21	8	-12/+54
* \| \| \|	let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]	Xavier Noria	2014-11-24	7	-12/+107
* \| \| \|	allow types to be passed in for USING casts	Aaron Patterson	2014-11-24	1	-0/+3
* \| \| \|	oops, forgot to add the real assertion!	Aaron Patterson	2014-11-24	1	-0/+1
* \| \| \|	allow the "USING" statement to be specified on change column calls	Aaron Patterson	2014-11-24	2	-1/+28
* \| \| \|	Merge pull request #17682 from ReneB/docs/update_all	Rafael Mendonça França	2014-11-24	1	-5/+5
\|\ \ \ \
\| * \| \| \|	Reword documentation for update_all	René van den Berg	2014-11-24	1	-8/+1
\| * \| \| \|	Explain that default_scope also influences update_all	René van den Berg	2014-11-20	1	-5/+12
* \| \| \| \|	Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependency	Rafael Mendonça França	2014-11-24	2	-3/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix sprockets-rails dependency dance	Arthur Neves	2014-11-24	2	-3/+1
* \| \| \| \| \|	Document `String#html_safe` [ci skip]	Sean Griffin	2014-11-24	1	-0/+5
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #17747 from gsamokovarov/missing-template-backtrace	David Heinemeier Hansson	2014-11-24	3	-0/+33
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|