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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #19839 from yui-knk/fix/guide2	Yves Senn	2015-04-21	1	-1/+1
\|\
\| *	[ci skip] Fix linked html file	yui-knk	2015-04-21	1	-1/+1
\|/
*	capitalize title	Xavier Noria	2015-04-20	1	-1/+1
*	Merge pull request #19822 from y-yagi/correct_generic_template_link	Godfrey Chan	2015-04-20	1	-1/+1
\|\
\| *	correct link to Generic template [ci skip]	yuuji.yaginuma	2015-04-20	1	-1/+1
\|/
*	Implicitly skip spring for `rails new --dev`	Godfrey Chan	2015-04-20	2	-1/+9
*	Consistency: Rails master -> edge Rails [ci skip]	Godfrey Chan	2015-04-20	1	-1/+1
*	Fix typos in contributing guide [ci skip]	Godfrey Chan	2015-04-19	1	-2/+2
*	Merge pull request #19821 from chancancode/bug_report_templates_guide	Zachary Scott	2015-04-19	1	-9/+13
\|\
\| *	Better explain the bug report templates [ci skip]	Godfrey Chan	2015-04-19	1	-9/+13
\|/
*	Only configure the queue in setup; DB creation must come later	Matthew Draper	2015-04-20	2	-21/+25
*	Shuffle a few things in aid of easier debugging	Matthew Draper	2015-04-20	1	-20/+36
*	Fix sidekiq test order dependency	Matthew Draper	2015-04-20	2	-2/+3
*	Merge pull request #19818 from chancancode/generic_bug_report_template	Eileen M. Uchitelle	2015-04-19	2	-0/+41
\|\
\| *	Add a "generic" bug report template	Godfrey Chan	2015-04-19	2	-0/+41
\|/
*	Merge pull request #19817 from tpitale/4_2-release-notes-fix	Rafael Mendonça França	2015-04-19	1	-3/+2
\|\
\| *	Update 4_2_release_notes.md	Tony Pitale	2015-04-19	1	-3/+2
* \|	Use _read_attribute(primary_key) instead of id	Rafael Mendonça França	2015-04-19	1	-1/+1
* \|	Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_stale	Sean Griffin	2015-04-19	2	-3/+25
\|\ \ \| \|/ \|/\|
\| *	Raise StaleObjectError if touched object is stale and locking is enabled	Mehmet Emin İNAÇ	2015-04-19	2	-3/+25
* \|	Merge pull request #19814 from y-yagi/array_inquiry	Rafael Mendonça França	2015-04-19	1	-0/+2
\|\ \
\| * \|	add missing require for ArrayInquirer	yuuji.yaginuma	2015-04-19	1	-0/+2
* \| \|	Merge pull request #19799 from yui-knk/fix/wrap_doc2	Arthur Nogueira Neves	2015-04-19	2	-5/+6
\|\ \ \
\| * \| \|	[ci skip] Fix docs and guide about 'Array.wrap'	yui-knk	2015-04-19	2	-5/+6
* \| \| \|	Merge pull request #19812 from piton4eg/patch-1	Robin Dupret	2015-04-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Update association_basics.md	Markov Alexey	2015-04-19	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #19811 from prathamesh-sonpatki/fix-aj-guide	Robin Dupret	2015-04-19	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Spell out "asynchronously" instead of async in guides [ci skip]	Prathamesh Sonpatki	2015-04-19	1	-1/+1
\|/ / /
* \| \|	Autosave existing records on HMT associations when the parent is new	Sean Griffin	2015-04-18	3	-6/+21
* \| \|	Merge pull request #19787 from Senjai/patch-2	Yves Senn	2015-04-18	1	-5/+4
\|\ \ \
\| * \| \|	Encourage users to user super to override methods.	Richard Wilson	2015-04-16	1	-5/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #19806 from vircung/master	Yves Senn	2015-04-18	1	-0/+23
\|\ \ \
\| * \| \|	Improve documentation [ci skip]	Jacek Nakonieczny	2015-04-18	1	-0/+25
\|/ / /
* \| \|	Merge pull request #19802 from sikachu/add-missing-require	Rafael Mendonça França	2015-04-17	1	-0/+1
\|\ \ \
\| * \| \|	Add missing require for String#strip_heredoc	Prem Sichanugrist	2015-04-17	1	-0/+1
\|/ / /
* \| \|	Merge pull request #19800 from yui-knk/fix/wrap_doc3	Abdelkader Boudih	2015-04-17	2	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	[ci skip] Replace `list` with `array`	yui-knk	2015-04-18	2	-2/+2
\|/ /
* \|	Merge pull request #19795 from yui-knk/fix/without_guide	Abdelkader Boudih	2015-04-17	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Update code example of Enumerable#without	yui-knk	2015-04-17	1	-1/+1
\|/
*	Merge pull request #19780 from 10io/active_job_testing	Abdelkader Boudih	2015-04-16	1	-0/+7
\|\
\| *	add active job testing section [ci skip]	David Fernandez	2015-04-16	1	-0/+7
\|/
*	Merge pull request #19778 from thenickcox/commands_docs	Richard Schneeman	2015-04-16	1	-0/+11
\|\
\| *	[ci skip] Document running a rake command as a rails command	Nick Cox	2015-04-15	1	-0/+11
\|/
*	Merge pull request #19775 from vngrs/fix_typo_asser_url	Abdelkader Boudih	2015-04-15	1	-6/+6
\|\
\| *	fix typo asser url [ci skip]	Mehmet Emin İNAÇ	2015-04-16	1	-6/+6
\|/
*	Merge pull request #19774 from davydovanton/doc-update-asser-url	Abdelkader Boudih	2015-04-15	1	-0/+30
\|\
\| *	[Skip ci] Add information about :host options	Anton Davydov	2015-04-16	1	-0/+30
* \|	Merge pull request #19766 from blasterpal/small_typo_in_asset_pipeline	Rafael Mendonça França	2015-04-15	1	-1/+1
\|\ \
\| * \|	Correct small typo.	Hank Beaver	2015-04-15	1	-1/+1
* \| \|	Merge pull request #19765 from y-yagi/fix_typo_in_form_builder	Kasper Timm Hansen	2015-04-15	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|