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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #18113 from ↵	Zachary Scott	2014-12-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eileencodes/fix-grammar-in-assets-configuring-guide Improve grammar in configuring serve_static_files guide [ci skip]
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Improve grammar in configuring serve_static_files guide	eileencodes	2014-12-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Describe the mailer and helpers directories which are generated by `rails new`.	Zachary Scott	2014-12-20	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Update comment regarding test environment with help from @matthewd [ci skip]	Zachary Scott	2014-12-20	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Renaming the autoloading guide [ci skip]	Vijay Dev	2014-12-20	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The term 'constant autoloading' can be mistakenly construed as 'constantly autoloading'.
* \| \| \| \| \| \| \| \| \|	pass over the autoloading guide [ci skip]	Vijay Dev	2014-12-20	1	-8/+8
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix link in autoloading guide	Andrey Samsonov	2014-12-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Add link for Domain-Specific Language [ci skip]	Andrey Nering	2014-12-19	1	-2/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #18100 from chancancode/serve_static_files	Godfrey Chan	2014-12-19	3	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md
* \| \| \| \| \| \| \|	last pass to the autoloading guide before release [ci skip]	Xavier Noria	2014-12-19	1	-17/+44
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #18082 from rails/17945_purge_in_test_only	Yves Senn	2014-12-19	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`db:schema:load` and `db:structure:load` do not purge the database
\| * \| \| \| \| \| \|	`force: :cascade` to recreate tables referenced by foreign-keys.	Yves Senn	2014-12-19	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Output extension is no longer generated [ci skip]	Zachary Scott	2014-12-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/cc @senny Is this change documented somewhere?
* \| \| \| \| \| \| \|	Spelling fix [ci skip]	George Millo	2014-12-18	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	passed a spell checker, not bad [ci skip]	Xavier Noria	2014-12-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	adds another examle to the constants not missing gotcha [ci skip]	Xavier Noria	2014-12-18	1	-0/+55
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/cc @matthewd
* \| \| \| \| \| \|	simpler example for the non-missing constants gotcha [ci skip]	Xavier Noria	2014-12-17	1	-42/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous example was a little convoluted and the exposition claifying the parts that were correct albeit not totally obvious were interferring in my view. This example has less things going on and gets to the key problem with less balls in the air.
* \| \| \| \| \| \|	[ci skip] Change three backticks to just one	yui-knk	2014-12-17	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix link in autoloading guide [ci skip]	yuuji.yaginuma	2014-12-17	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improving Method Chaining section [ci skip]	Andrey Nering	2014-12-16	1	-5/+28
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	"backoffice" -> "back office", "lookup" -> "look up"	Jon Atack	2014-12-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Lookup" is a noun, but not a verb. The verb is "look up". [skip ci]
* \| \| \| \| \| \|	Merge pull request #18050 from jonatack/patch-13	Xavier Noria	2014-12-16	1	-7/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve section in constant autoload guide
\| * \| \| \| \| \| \|	Improve section in constant autoload guide	Jon Atack	2014-12-16	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \| \|	Improve grammar	Jon Atack	2014-12-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \| \|	Constant autoload grammar fix	Jon Atack	2014-12-16	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \|	docs, synchronize CHANGELOG across branches. [ci skip]	Yves Senn	2014-12-16	1	-11/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #18047 from ↵	Abdelkader Boudih	2014-12-16	1	-5/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JuanitoFatas/patch/constant_autoloading_and_reloading-list-items [ci skip] :scissors: blank lines between list items.
\| * \| \| \| \| \| \|	[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
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] /cc @sgrif @zzak Conflicts: activerecord/CHANGELOG.md
* \| \| \| \| \| \|	undoes a recent merged edit [ci skip]	Xavier Noria	2014-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I think "What" is was fine, "The purpose of" assumes the reader knows such thing exists. "What is" is fine, and also matches the following "What is require_dependency".
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.2.0", then they should have no problems hacking with Rails. [ci skip] If they do, then its a bug and it should be reported.
* \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \|	Improving tips about installation in the guides [ci skip]	Andrey Nering	2014-12-12	1	-6/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-8' of https://github.com/jonatack/rails into ↵	Zachary Scott	2014-12-15	1	-7/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jonatack-patch-8 [ci skip] Conflicts: guides/source/constant_autoloading_and_reloading.md
\| * \| \| \| \| \| \| \|	Update constant_autoloading_and_reloading.md	Jon Atack	2014-12-15	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci] Follow-up to previous commit [skip ci] Fix previous merge [skip ci]
* \| \| \| \| \| \| \| \|	Merge pull request #18046 from stephenminded/counter_cache_docs_fix	Arthur Nogueira Neves	2014-12-15	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Counter cache Rails guides fix
\| * \| \| \| \| \| \| \| \|	You need to specify the counter_cache option on the has_many side of the ↵	Steve Lounsbury	2014-12-16	1	-1/+7
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association when using a custom counter cache column. This is documented on the has_many association here: http://apidock.com/rails/ActiveRecord/Associations/ClassMethods/has_many [ci skip]
* \| \| \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #18040 from jonatack/patch-11	Zachary Scott	2014-12-15	1	-10/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve autoload_paths section [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Improve autoload_paths section	Jon Atack	2014-12-15	1	-10/+9
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \| \| \| \|	Minor typos/fixes to autoloading guide	claudiob	2014-12-15	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	@fxn Great job with the guide, I read it all! Yeah! Some paragraphs might be restructured, but I'll leave that to you since you are currently working on it. This commit only includes some minor typos and commas that in my opinion clarify the reading. [ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #16924 from Sinjo/params-deep-munge-empty-array	Godfrey Chan	2014-12-15	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't convert empty arrays to nils when deep munging params
\| * \| \| \| \| \| \| \| \| \|	Don't convert empty arrays to nils when deep munging params	Chris Sinjakli	2014-12-15	2	-6/+6
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	autoloading guide: applies some Strunk & White and hyperlinking [ci skip]	Xavier Noria	2014-12-15	1	-101/+80
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #18041 from andreynering/ar-guides-querying-2	Rafael Mendonça França	2014-12-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Dynamic finders already deprecated [ci skip]
\| * \| \| \| \| \| \| \| \|	Already deprecated [ci skip]	Andrey Nering	2014-12-15	1	-1/+1
\| \|/ / / / / / / /