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

	Commit message (Expand)	Author	Age	Files	Lines
*	Speed up JRuby tests by improving its startup time	Peter Suschlik	2014-08-25	1	-7/+10
*	Merge pull request #16681 from seuros/master	Jeremy Kemper	2014-08-24	1	-0/+1
\|\
\| *	[ActiveJob] Add activesupport as dependency [ci skip]	Abdelkader Boudih	2014-08-24	1	-0/+1
* \|	Merge pull request #16639 from agrobbin/input-placeholder-i18n	Jeremy Kemper	2014-08-24	5	-0/+231
\|\ \
\| * \|	just use the placeholder tag value if it is passed as a String	Alex Robbin	2014-08-22	2	-5/+22
\| * \|	add I18n support for `:placeholder` HTML option is passed to form fields	Alex Robbin	2014-08-22	5	-0/+214
* \| \|	Merge pull request #16662 from robin850/duration-instance-of	Jeremy Kemper	2014-08-24	3	-9/+14
\|\ \ \
\| * \| \|	Skip #eql? tests on Rubinius for AS::Duration	Robin Dupret	2014-08-24	1	-0/+3
\| * \| \|	Follow-up to #16560	Robin Dupret	2014-08-24	3	-9/+11
* \| \| \|	Merge pull request #16616 from schneems/schneems/jeremy-comments	Jeremy Kemper	2014-08-24	7	-12/+58
\|\ \ \ \
\| * \| \| \|	Address comments on Gzip implementation	schneems	2014-08-24	7	-12/+58
* \| \| \| \|	Merge pull request #16680 from huoxito/update-dependencies	Robin Dupret	2014-08-24	1	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	treetop is no longer a mail (rails) dependency	Washington Luiz	2014-08-24	1	-2/+0
\|/ / / / /
* \| \| \| \|	Whoops, duplicated word [ci skip]	Robin Dupret	2014-08-24	1	-1/+1
* \| \| \| \|	Some tweaks to the development set-up guide	Robin Dupret	2014-08-24	1	-43/+41
* \| \| \| \|	Fix a few typos [ci skip]	Robin Dupret	2014-08-24	2	-2/+2
* \| \| \| \|	Merge pull request #16673 from y-yagi/update_statistics_rake	Matthew Draper	2014-08-25	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	show stats for app/jobs	yuuji.yaginuma	2014-08-24	1	-1/+2
* \| \| \| \| \|	Merge pull request #16675 from tomkadwill/has_many_documenting_extension_param	Santiago Pastorino	2014-08-24	1	-0/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Added documentation for has_many extension parameter	Tom Kadwill	2014-08-24	1	-0/+14
* \| \| \| \| \| \|	Merge pull request #16676 from tgxworld/web_console_release_note_fixes	Matthew Draper	2014-08-25	1	-4/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Grammer and spelling pass on web console release note. [CI SKIP]	Guo Xiang Tan	2014-08-25	1	-4/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #16674 from gsamokovarov/describe-web-console	Guillermo Iguaran	2014-08-24	1	-4/+14
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Describe web-console in the release notes [ci skip]	Genadi Samokovarov	2014-08-24	1	-4/+14
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #16671 from cristianbica/aj-raise-serialization-error	Matthew Draper	2014-08-25	2	-5/+16
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Raise ActiveJob::SerializationError when cannot serialize job arguments	Cristian Bica	2014-08-24	2	-5/+16
\|/ / / / /
* \| \| \| \|	Merge pull request #16667 from JuanitoFatas/patch/anchor-generation	Godfrey Chan	2014-08-24	1	-1/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Fix guide anchor generation logic.	Juanito Fatas	2014-08-24	1	-1/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	CHANGELOG & improvements to #16649	Godfrey Chan	2014-08-23	2	-2/+9
* \| \| \|	Merge pull request #16649 from Agis-/pg-columns-for-distinct	Godfrey Chan	2014-08-23	2	-1/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Don't trim excess whitespace in pg #columns_for_distinct	Agis-	2014-08-24	2	-1/+10
\|/ / /
* \| \|	Merge pull request #16659 from y-yagi/patch-4	Vijay Dev	2014-08-23	1	-1/+1
\|\ \ \
\| * \| \|	Fix example code in Active Job guide [ci skip]	yuuji.yaginuma	2014-08-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #16655 from brocktimus/20140823_doco_change	Zachary Scott	2014-08-23	1	-1/+1
\|\ \ \
\| * \| \|	Properly referencing AR::RecordNotFound in AJ guide rescuing example	Brock Trappitt	2014-08-23	1	-1/+1
* \| \| \|	Merge pull request #16650 from zzak/fix-precision-number_to_rounded_converter	Zachary Scott	2014-08-22	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use zero-padding for number_to_rounded_converter	Zachary Scott	2014-08-22	1	-1/+1
* \| \| \| \|	Merge pull request #16647 from tjschuck/form_for_doc_options	Rafael Mendonça França	2014-08-22	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove erroneous form_tag option docs	T.J. Schuck	2014-08-22	1	-1/+0
\| * \| \| \| \|	Clarify that unknown keys will become HTML attrs	T.J. Schuck	2014-08-22	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #16602 from thetron/active_job_que_enqueue_at_support	Rafael Mendonça França	2014-08-22	3	-1/+12
\|\ \ \ \ \
\| * \| \| \| \|	Added enqueue_at support for QueAdapter in ActiveJob	Nicholas Bruning	2014-08-21	3	-1/+12
* \| \| \| \| \|	Merge pull request #16648 from seuros/master	Rafael Mendonça França	2014-08-22	3	-2/+26
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ActiveJob] Add hook for test_framework and test templates	Abdelkader Boudih	2014-08-22	3	-2/+26
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #16598 from seuros/master	Matthew Draper	2014-08-23	1	-0/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ActionMailer] require activejob railtie	Abdelkader Boudih	2014-08-22	1	-0/+1
* \| \| \| \| \| \|	Merge pull request #15932 from joseluistorres/issue-11957-uuids	Rafael Mendonça França	2014-08-22	3	-1/+17
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	adding the exception RecordNotFound to UUID find	JoseLuis Torres	2014-08-21	3	-1/+17
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #16645 from sgrif/sg-perf-regression	Rafael Mendonça França	2014-08-22	1	-8/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't calculate in-place changes twice	Sean Griffin	2014-08-22	1	-8/+0
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|