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

	Commit message (Expand)	Author	Age	Files	Lines
*	Encourage users to user super to override methods.	Richard Wilson	2015-04-16	1	-5/+4
*	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
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	remove extra `=` in form builder example [ci skip]	yuuji.yaginuma	2015-04-15	1	-1/+1
\|/ /
* \|	Merge pull request #19763 from jonatack/fix-typos-in-docs	Yves Senn	2015-04-15	11	-29/+55
\|\ \
\| * \|	Fix typos and improve the documentation	Jon Atack	2015-04-15	11	-29/+55
* \| \|	Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"	Yves Senn	2015-04-15	3	-15/+0
\|/ /
* \|	Merge pull request #19446 from andersonDadario/fix_security_guide_captcha_03_...	Zachary Scott	2015-04-14	1	-4/+6
\|\ \
\| * \|	[ci skip] Fix for Security Guide - Captcha Section	Anderson Dadario	2015-03-22	1	-4/+6
* \| \|	Merge pull request #19757 from Strech/http-auth-realm-unquoting	Arthur Nogueira Neves	2015-04-14	1	-2/+2
\|\ \ \
\| * \| \|	Tiny optimization of http auth Realm unquoting	Strech (Sergey Fedorov)	2015-04-14	1	-2/+2
* \| \| \|	Merge pull request #19752 from yuki24/use-prepend-rather-than-alias	Carlos Antonio da Silva	2015-04-14	2	-42/+36
\|\ \ \ \
\| * \| \| \|	Use #prepend rather than using 2 aliases	Yuki Nishijima	2015-04-14	2	-42/+36
* \| \| \| \|	Enable Active Job integration tests again	Rafael Mendonça França	2015-04-14	1	-1/+0
* \| \| \| \|	avoid double initialization error caused to sidekiq	Takumi IINO	2015-04-14	1	-13/+34
* \| \| \| \|	Merge pull request #19758 from andreynering/remove-gzip-doc	Rafael Mendonça França	2015-04-14	1	-35/+0
\|\ \ \ \ \
\| * \| \| \| \|	Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]	Andrey Nering	2015-04-14	1	-35/+0
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Fix typos in the documentation [ci skip]	Rafael Mendonça França	2015-04-14	1	-1/+1
* \| \| \| \|	Merge pull request #19736 from kmcphillips/master	Rafael Mendonça França	2015-04-14	10	-1/+129
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Override default form builder for a controller	Kevin McPhillips	2015-04-13	10	-1/+129
* \| \| \| \|	Use `silence_warnings` on `StaticTests`	eileencodes	2015-04-14	1	-6/+12
* \| \| \| \|	Merge pull request #19751 from y-yagi/fix_indent_of_controller	Andrew White	2015-04-14	2	-4/+7
\|\ \ \ \ \
\| * \| \| \| \|	fix indent in routes when using namespaced controllers	yuuji.yaginuma	2015-04-14	2	-4/+7
* \| \| \| \| \|	Merge pull request #19755 from yuki24/activerecord/support-for-set	Yves Senn	2015-04-14	3	-0/+15
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add support for Set to Relation#where	Yuki Nishijima	2015-04-13	3	-0/+16
* \| \| \| \| \|	Merge pull request #19754 from yuki24/ruby-2.2.2-on-travis	Guillermo Iguaran	2015-04-13	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use Ruby 2.2.2 on travis	Yuki Nishijima	2015-04-13	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #19753 from jonatack/use-ruby-2-2-2	Guillermo Iguaran	2015-04-13	12	-15/+15
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Upgrade to Ruby 2.2.2	Jon Atack	2015-04-14	12	-15/+15
* \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-04-14	7	-48/+34
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci skip] add missing file extension	Mikhail Dieterle	2015-04-10	1	-1/+1
\| * \| \| \| \|	[ci skip] format rake output	Mikhail Dieterle	2015-04-10	1	-5/+3
\| * \| \| \| \|	[ci skip] fix helper name	Mikhail Dieterle	2015-04-10	1	-1/+1
\| * \| \| \| \|	[ci skip] Wrap with double quotation	yui-knk	2015-04-10	1	-1/+1
\| * \| \| \| \|	[ci skip] Add `,`	yui-knk	2015-04-08	1	-1/+1
\| * \| \| \| \|	[ci skip] Remove unnecessary lines	yui-knk	2015-04-01	1	-2/+0
\| * \| \| \| \|	[ci skip] Add `:`	yui-knk	2015-04-01	1	-1/+1
\| * \| \| \| \|	No need to mention unit tests in testing guide anymore	Kir Shatrov	2015-03-31	1	-2/+0
\| * \| \| \| \|	New test runner syntax in testing guide	Kir Shatrov	2015-03-31	1	-4/+4
\| * \| \| \| \|	Suggest new hash syntax in testing guide	Kir Shatrov	2015-03-31	1	-2/+2
\| * \| \| \| \|	[ci skip] Remove unnecessary `>`	yui-knk	2015-03-31	1	-1/+1