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

	Commit message (Expand)	Author	Age	Files	Lines
*	Missing space. [CI SKIP]	Guo Xiang Tan	2014-08-22	1	-1/+1
*	Merge pull request #11859 from zzak/nested_model_forms_guide	Zachary Scott	2014-08-22	1	-1/+4
\|\
\| *	add nested_model_forms to guides/documents.yaml [wip] [ci skip]	Zachary Scott	2014-08-22	1	-1/+4
\|/
*	Merge branch 'jonatack-patch-8'	Zachary Scott	2014-08-22	1	-2/+6
\|\
\| *	Follow up on #16408	Jon Atack	2014-08-22	1	-2/+6
\|/
*	[ci skip] Running AR tests guide [Fixes GH-15891]	Zachary Scott	2014-08-22	1	-2/+2
*	Merge pull request #16630 from tomkadwill/added_has_and_belongs_to_many_scope...	Zachary Scott	2014-08-22	1	-0/+12
\|\
\| *	[ci skip] Added documentation for has_and_belongs_to_many scope parameter	Tom Kadwill	2014-08-22	1	-0/+12
\|/
*	Merge pull request #16629 from rails/revert-16438-input-placeholder-i18n	Jeremy Kemper	2014-08-21	5	-214/+0
\|\
\| *	Revert "Add I18n support for `:placeholder` HTML option is passed to form fie...	Jeremy Kemper	2014-08-21	5	-214/+0
\|/
*	Merge pull request #16604 from saarons/clean-remote-ip-middleware	Jeremy Kemper	2014-08-21	3	-53/+61
\|\
\| *	Refactor ActionDispatch::RemoteIp	Sam Aarons	2014-08-21	3	-53/+61
* \|	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
\|/
*	ActiveJob -> Active Job [ci skip]	Xavier Noria	2014-08-21	3	-3/+3
*	applies API guidelines to new AM docs	Xavier Noria	2014-08-21	2	-32/+32
*	Merge pull request #16621 from Calyhre/patch-1	Rafael Mendonça França	2014-08-21	1	-0/+3
\|\
\| *	Add change to ActionView Notable changes [ci skip]	Charley D	2014-08-21	1	-0/+3
\|/
*	Merge pull request #16271 from alol/action-view-overview-guide-tweaks	Vijay Dev	2014-08-22	1	-11/+11
\|\
\| *	Small Action View Overview edits [ci skip]	Alan Oliver	2014-07-24	1	-11/+11
* \|	Merge pull request #16204 from jonatack/patch-7	Vijay Dev	2014-08-21	1	-12/+14
\|\ \
\| * \|	Grammar pass	Jon Atack	2014-08-19	1	-12/+14
* \| \|	Merge pull request #16617 from tomkadwill/added_has_one_scope_documentation	Zachary Scott	2014-08-21	1	-0/+11
\|\ \ \
\| * \| \|	[ci skip] Added documentation for has_one scope parameter	Tom Kadwill	2014-08-21	1	-0/+11
* \| \| \|	Merge pull request #16615 from tgxworld/guide_fix	Zachary Scott	2014-08-21	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Guide fix. [CI SKIP]	Guo Xiang Tan	2014-08-22	1	-3/+3
* \| \| \| \|	Make text consistent in help text of rails server and console commands.	Vijay Dev	2014-08-21	2	-13/+13
\|/ / / /
* \| \| \|	Merge pull request #16612 from loganhasson/master	Zachary Scott	2014-08-21	1	-5/+5
\|\ \ \ \
\| * \| \| \|	[ci skip] Clarify Action Mailer/Active Job usage note	Logan Hasson	2014-08-21	1	-5/+5
\| \|/ / /
* \| \| \|	Merge pull request #16607 from tgxworld/upgrading_guide_pass	Santiago Pastorino	2014-08-21	1	-9/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Upgrade guide pass. [CI SKIP]	Guo Xiang Tan	2014-08-21	1	-9/+10
* \| \| \|	Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notes	Yves Senn	2014-08-21	1	-3/+0
\|\ \ \ \
\| * \| \| \|	Fix some issues in 4.2 release notes.	Geoffrey ROGUELON	2014-08-21	1	-3/+0
* \| \| \| \|	Merge pull request #15443 from tgxworld/preload_head_routes	Andrew White	2014-08-21	5	-24/+80
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Improve router test.	Guo Xiang Tan	2014-08-21	1	-6/+11
\| * \| \| \|	Avoid duplicating routes for HEAD requests.	Guo Xiang Tan	2014-08-21	5	-18/+69
\|/ / / /
* \| \| \|	Merge pull request #16603 from jwworth/task/fix_grammar	Zachary Scott	2014-08-20	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Change 'does' to 'do'	Jake Worth	2014-08-21	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #16466 from schneems/schneems/gzip-action-dispatch	Guillermo Iguaran	2014-08-20	7	-16/+76
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Enable gzip compression by default	schneems	2014-08-20	7	-16/+76
\|/ / /
* \| \|	Merge pull request #16600 from bradly/spelling-fix-in-testing-guide	Zachary Scott	2014-08-20	1	-1/+1
\|\ \ \
\| * \| \|	[ci skip] Fixing spelling typo in testing guide.	Bradly Feeley	2014-08-20	1	-1/+1
\|/ / /
* \| \|	"warning: assigned but unused variable"	Akira Matsuda	2014-08-21	1	-1/+1
* \| \|	Fix SyntaxError	Akira Matsuda	2014-08-21	1	-1/+1
* \| \|	Merge pull request #16597 from teeparham/master	Zachary Scott	2014-08-20	1	-2/+0
\|\ \ \
\| * \| \|	Update configuring.md [ci skip]	Tee Parham	2014-08-20	1	-2/+0
\|/ / /
* \| \|	Make the explicit the Active Job dependency of Action Mailer	Rafael Mendonça França	2014-08-20	1	-0/+1
* \| \|	Remove timestamp type from generator usage	Rafael Mendonça França	2014-08-20	1	-1/+0
* \| \|	Merge pull request #16594 from loganhasson/master	Zachary Scott	2014-08-20	2	-2/+2
\|\ \ \
\| * \| \|	[ci skip] Fix Active Job grammar in api docs	Logan Hasson	2014-08-20	2	-2/+2