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

	Commit message (Expand)	Author	Age	Files	Lines
*	Improving Method Chaining section [ci skip]	Andrey Nering	2014-12-16	1	-5/+28
*	Merge pull request #17995 from jethroo/fix/assert_template_with_unsupported_l...	Rafael Mendonça França	2014-12-16	2	-0/+9
\|\
\| *	adding that assert_template with :layout will raise ArgumentError for unknown...	Carsten Wirth	2014-12-16	2	-0/+9
* \|	Merge pull request #18055 from jonatack/patch-8	Zachary Scott	2014-12-16	1	-2/+2
\|\ \
\| * \|	"backoffice" -> "back office", "lookup" -> "look up"	Jon Atack	2014-12-16	1	-2/+2
\|/ /
* \|	Merge pull request #18049 from yuki3738/fix_rails_db_command_error	Rafael Mendonça França	2014-12-16	1	-1/+1
\|\ \
\| * \|	Add a code checking about file or not to the rails db command	yuki3738	2014-12-16	1	-1/+1
* \| \|	Merge pull request #18052 from timoschilling/reset_variants	Rafael Mendonça França	2014-12-16	2	-1/+9
\|\ \ \
\| * \| \|	allow reseting of request variants	Timo Schilling	2014-12-16	2	-1/+9
* \| \| \|	Merge pull request #18032 from claudiob/add-test-for-after-validate-callbacks	Rafael Mendonça França	2014-12-16	2	-6/+28
\|\ \ \ \
\| * \| \| \|	Add AM test: after/around callback returning false	claudiob	2014-12-14	1	-4/+15
\| * \| \| \|	Add AM test for after_validation returning false	claudiob	2014-12-14	1	-2/+13
* \| \| \| \|	Merge pull request #18054 from jonatack/add_content_tag_test	Rafael Mendonça França	2014-12-16	1	-0/+5
\|\ \ \ \ \
\| * \| \| \| \|	Test to ensure content_tag works when fixing #17661	Jon Atack	2014-12-16	1	-0/+5
* \| \| \| \| \|	Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminator	Rafael Mendonça França	2014-12-16	2	-19/+38
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add test for `:skip_after_callbacks_if_terminated`	claudiob	2014-12-14	2	-19/+38
\| \|/ / / /
* \| \| \| \|	Merge pull request #18050 from jonatack/patch-13	Xavier Noria	2014-12-16	1	-7/+7
\|\ \ \ \ \
\| * \| \| \| \|	Improve section in constant autoload guide	Jon Atack	2014-12-16	1	-7/+7
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #18036 from claudiob/remove-redundant-tests-about-around-a...	Rafael Mendonça França	2014-12-16	1	-19/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove misleading test: around_action return false	claudiob	2014-12-15	1	-19/+1
* \| \| \| \| \|	Merge pull request #18053 from georgemillo/patch-2	Arthur Nogueira Neves	2014-12-16	1	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	English fix [ci skip]	George Millo	2014-12-16	1	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #18051 from jonatack/patch-14	Eileen M. Uchitelle	2014-12-16	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Improve grammar	Jon Atack	2014-12-16	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #18048 from jonatack/patch-8	Xavier Noria	2014-12-16	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Constant autoload grammar fix	Jon Atack	2014-12-16	1	-2/+2
\|/ / / / /
* \| \| \| \|	docs, synchronize CHANGELOG across branches. [ci skip]	Yves Senn	2014-12-16	1	-11/+12
* \| \| \| \|	Merge pull request #18047 from JuanitoFatas/patch/constant_autoloading_and_re...	Abdelkader Boudih	2014-12-16	1	-5/+0
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] :scissors: blank lines between list items.	Juanito Fatas	2014-12-16	1	-5/+0
\| \| \|_\|/ / \| \|/\| \| \|
* / \| \| \|	decribe deprecation cycle from `timestamps null: false` to `null: true`.	Yves Senn	2014-12-16	1	-0/+4
\|/ / / /
* \| \| \|	undoes a recent merged edit [ci skip]	Xavier Noria	2014-12-16	1	-1/+1
* \| \| \|	missing preposition [ci skip]	Xavier Noria	2014-12-16	1	-1/+1
* \| \| \|	syncs the autoloading guide and undoes some merged changes [ci skip]	Xavier Noria	2014-12-16	1	-17/+16
* \| \| \|	Remove this tip, if the previous statement is true.. ie: The reader sees "Rails	Zachary Scott	2014-12-15	1	-5/+0
* \| \| \|	Merge pull request #17992 from andreynering/guides-intallation	Zachary Scott	2014-12-15	1	-6/+11
\|\ \ \ \
\| * \| \| \|	Improving tips about installation in the guides [ci skip]	Andrey Nering	2014-12-12	1	-6/+11
* \| \| \| \|	Merge branch 'jonatack-patch-8' [ci skip]	Zachary Scott	2014-12-15	1	-7/+9
\|\ \ \ \ \
\| * \| \| \| \|	Merge branch 'patch-8' of https://github.com/jonatack/rails into jonatack-pat...	Zachary Scott	2014-12-15	1	-7/+9
\|/\| \| \| \| \|
\| * \| \| \| \|	Update constant_autoloading_and_reloading.md	Jon Atack	2014-12-15	1	-8/+8
* \| \| \| \| \|	Merge pull request #18046 from stephenminded/counter_cache_docs_fix	Arthur Nogueira Neves	2014-12-15	1	-1/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	You need to specify the counter_cache option on the has_many side of the asso...	Steve Lounsbury	2014-12-16	1	-1/+7
\| \|/ / / / /
* \| \| \| \| \|	Add CHANGELOG for #18034 [ci skip]	Zachary Scott	2014-12-15	1	-0/+4
* \| \| \| \| \|	Merge pull request #18034 from andreynering/ar-guides-querying	Zachary Scott	2014-12-15	1	-0/+35
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Adding method chaining section on ActiveRecord querying guide [ci skip]	Andrey Nering	2014-12-15	1	-0/+35
* \| \| \| \| \| \|	Ruby will allocate the class as a side-effect, since it is already defined.	Zachary Scott	2014-12-15	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #18040 from jonatack/patch-11	Zachary Scott	2014-12-15	1	-10/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Improve autoload_paths section	Jon Atack	2014-12-15	1	-10/+9
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #18043 from claudiob/minor-autoloading-guides-fixes	Abdelkader Boudih	2014-12-16	1	-8/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Minor typos/fixes to autoloading guide	claudiob	2014-12-15	1	-8/+8
\|/ / / / / /
* \| \| \| \| \|	Regression test for #18024	Santiago Pastorino	2014-12-15	1	-0/+5