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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Show source view and backtrace on missing template errors	Genadi Samokovarov	2014-11-24	3	-0/+33
* \| \| \|	Merge pull request #17748 from claudiob/remove-unwanted-comments-from-documen...	Zachary Scott	2014-11-24	4	-0/+14
\|\ \ \ \
\| * \| \| \|	Mark comments that should not be in the docs	claudiob	2014-11-24	4	-0/+14
\|/ / / /
* \| \| \|	Add `.reflections` change to release note [skip ci]	Arthur Neves	2014-11-24	1	-0/+3
* \| \| \|	Ensure the type map's cache is thread safe	Sean Griffin	2014-11-24	1	-3/+7
* \| \| \|	Merge pull request #17725 from chancancode/deprecate_use_route	Godfrey Chan	2014-11-24	5	-5/+41
\|\ \ \ \
\| * \| \| \|	Don't show the warning if we're already raising the error anyway	Godfrey Chan	2014-11-23	1	-8/+13
\| * \| \| \|	Deprecate `use_route` in controller tests	Godfrey Chan	2014-11-23	2	-3/+24
\| * \| \| \|	Deprecate passing an invalid name to `Formatter#generate`	Godfrey Chan	2014-11-23	1	-0/+10
\| * \| \| \|	Fix cases where the wrong name is passed to `Formatter#generate`	Godfrey Chan	2014-11-23	2	-2/+2
* \| \| \| \|	Merge pull request #17737 from yui-knk/fix/head	Santiago Pastorino	2014-11-24	2	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	Replace ActionDispatch::Head with Rack::Head.	yui-knk	2014-11-24	2	-5/+5
* \| \| \| \| \|	Merge pull request #17678 from siddharth28/includes_with_scope_with_joins	Santiago Pastorino	2014-11-24	5	-12/+17
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix includes on association with a scope containing joins along with conditions	siddharth@vinsol.com	2014-11-21	5	-12/+17
* \| \| \| \| \| \|	Merge pull request #17707 from claudiob/move-debug-helper-test	Rafael Mendonça França	2014-11-24	1	-0/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Move test that depends on ActiveRecord	claudiob	2014-11-21	1	-0/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #17744 from RichardLitt/doc-fix-syntax	Rafael Mendonça França	2014-11-24	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix wrong path in comments about stylesheets	Richard Littauer	2014-11-24	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #17742 from RichardLitt/doc-fix-syntax	Rafael Mendonça França	2014-11-24	4	-4/+4
\|\\| \| \| \| \| \| \| \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Change 'of plugins' syntax	Richard Littauer	2014-11-24	4	-4/+4
\|/ / / / / /
* \| / / / /	cleanup, remove trailing whitespace [ci skip]	Yves Senn	2014-11-24	1	-2/+2
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Grammar pass on Web Console release note [ci skip]	Zachary Scott	2014-11-23	1	-3/+3
* \| \| \| \|	Clarify what is being serialized and when it will be deserialized	Zachary Scott	2014-11-23	1	-2/+2
* \| \| \| \|	Merge pull request #17721 from yui-knk/fix/rails_on_rack_guide	Zachary Scott	2014-11-23	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Fix class name of middleware.	yui-knk	2014-11-23	1	-1/+1
* \| \| \| \| \|	Merge pull request #17732 from rails/add-reflections-string-keys-test	Guillermo Iguaran	2014-11-23	1	-0/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add a test for reflection keys as Strings, fixes #16928	Zachary Scott	2014-11-23	1	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #17723 from marocu/patch-1	Arthur Nogueira Neves	2014-11-23	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Specified beta branch for web-console gem	Matthew Cullum	2014-11-22	1	-1/+1
* \| \| \| \| \|	Correct example in the engines testing guide [ci skip]	Godfrey Chan	2014-11-23	1	-14/+25
* \| \| \| \| \|	Test using `ActionController::TestCase` with engines	Godfrey Chan	2014-11-23	1	-0/+52
* \| \| \| \| \|	Merge pull request #17715 from tgxworld/fix_nil_anchor	Godfrey Chan	2014-11-22	3	-1/+20
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Anchor should not be appended when set to nil/false.	Guo Xiang Tan	2014-11-23	3	-1/+20
* \| \| \| \| \|	Merge pull request #17722 from yui-knk/fix/callbacks_comment	Zachary Scott	2014-11-22	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|