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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \|	Merge pull request #16593 from aditya-kapoor/add-doc-for-step	Zachary Scott	2014-08-20	1	-3/+6
\|\ \
\| * \|	[ci skip] add doc for STEP in migration	Aditya Kapoor	2014-08-21	1	-3/+6
\| \|/
* \|	Merge pull request #16575 from tomkadwill/added_has_many_scope_documentation	Zachary Scott	2014-08-20	1	-0/+11
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Added documentation for has_many scope parameter	Tom Kadwill	2014-08-20	1	-0/+11
* \|	Merge pull request #16592 from aditya-kapoor/fix-migration-docs	Santiago Pastorino	2014-08-20	1	-9/+2
\|\ \
\| * \|	[ci skip] correct docs about the migration generation	Aditya Kapoor	2014-08-21	1	-9/+2
* \| \|	Merge pull request #16590 from loganhasson/master	Zachary Scott	2014-08-20	1	-8/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix a few typos/some grammar in Active Job Basics	Logan Hasson	2014-08-20	1	-8/+8
\|/ /
* \|	Same as f39cb2b except backport friendly	Zachary Scott	2014-08-20	1	-1/+4
* \|	Same as f39cb2b except backport friendly	Zachary Scott	2014-08-20	1	-4/+4
* \|	Point release notes to stable branch for list of commits. [ci skip]	Zachary Scott	2014-08-20	6	-9/+15
* \|	Merge pull request #16587 from seuros/master	Rafael Mendonça França	2014-08-20	2	-16/+16
\|\ \
\| * \|	[Rdoc] Make clear that we are sending an AR object [ci skip]	Abdelkader Boudih	2014-08-20	2	-16/+16
\|/ /
* \|	Merge pull request #16172 from Agis-/hmt_scope_arity	Rafael Mendonça França	2014-08-20	6	-1/+29
\|\ \
\| * \|	Only merge scopes with zero arity in has_many through	Agis-	2014-08-20	6	-1/+29
* \| \|	Merge pull request #16586 from seuros/master	Rafael Mendonça França	2014-08-20	2	-16/+16
\|\ \ \
\| * \| \|	Fix typo in rdoc [ci skip]	Abdelkader Boudih	2014-08-20	2	-16/+16
\|/ / /
* \| \|	Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliver	Rafael Mendonça França	2014-08-20	19	-101/+227
\|\ \ \
\| * \| \|	Updated rdoc / guides / release notes related to ActiveJob / ActionMailer	Cristian Bica	2014-08-20	11	-54/+141
\| * \| \|	Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!	Cristian Bica	2014-08-20	9	-53/+92
* \| \| \|	Merge pull request #16585 from nicolasblanco/require_active_job	Rafael Mendonça França	2014-08-20	2	-0/+2
\|\ \ \ \
\| * \| \| \|	Require ActiveJob in case a skip_xxx option is given	slainer68	2014-08-20	2	-0/+2
* \| \| \| \|	Merge pull request #16583 from JuanitoFatas/doc/patch-1	Rafael Mendonça França	2014-08-20	1	-16/+22
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Format pass of Active Job Basics guide.	Juanito Fatas	2014-08-20	1	-16/+22
* \| \| \| \|	Fixes the digits counter of AS's NumberToRoundedConverter	Xavier Noria	2014-08-20	2	-1/+2
* \| \| \| \|	Merge pull request #16145 from phoet/patch-2	Rafael Mendonça França	2014-08-20	2	-10/+15
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	don't log errors when all is fine	Peter Schröder	2014-07-17	2	-10/+15