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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope...	Rafael Mendonça França	2013-09-28	4	-4/+34
\|\
\| *	Removed where_values_hash from AR::NullRelation	Paul Nikitochkin	2013-09-28	4	-4/+34
* \|	Merge pull request #12396 from arthurnn/cleanup_logsubs	Rafael Mendonça França	2013-09-28	1	-11/+2
\|\ \
\| * \|	Cleanup identitymap logger from LogSubscriber	Arthur Neves	2013-09-28	1	-11/+2
* \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-09-28	10	-60/+27
\|\ \ \
\| * \| \|	Added missing active record configurations.	wangjohn	2013-09-25	1	-0/+6
\| * \| \|	Fix link_to return value	Earl J St Sauver	2013-09-22	1	-1/+1
\| * \| \|	use active voice and use more descriptive terms	Weston Platter	2013-09-22	1	-1/+1
\| * \| \|	`skiping` => `skipping`	Vipul A M	2013-09-17	1	-1/+1
\| * \| \|	Fix Show link on resource	Vipul A M	2013-09-17	1	-1/+1
\| * \| \|	incorrect url	Sergio	2013-09-16	1	-1/+1
\| * \| \|	incorrect urls	Sergio	2013-09-16	1	-2/+2
\| * \| \|	surplus : in attachment_fu plugin	Sergio	2013-09-15	1	-1/+1
\| * \| \|	EncryptedCookieStore => CookieStore [ci skip]	Rashmi Yadav	2013-09-13	1	-1/+1
\| * \| \|	asset_url => asset-url in sass-rails docs [ci skip]	Rashmi Yadav	2013-09-13	1	-1/+1
\| * \| \|	Removed doc of diff method [ci skip]	Rashmi Yadav	2013-09-13	1	-38/+0
\| * \| \|	Updated guides with latest method [ci skip]	Rashmi Yadav	2013-09-13	1	-2/+2
\| * \| \|	Updated the file path [ci skip]	Rashmi Yadav	2013-09-13	1	-4/+4
\| * \| \|	Updated with latest method [ci skip]	Rashmi Yadav	2013-09-13	1	-4/+5
\| * \| \|	Revert ""generates" applies to "collection radio" so it should be singular"	Rafael Mendonça França	2013-09-12	1	-2/+2
\| * \| \|	take out reference to previous versions of Rails	Waynn Lue	2013-09-12	1	-3/+1
\| * \| \|	"generates" applies to "collection radio" so it should be singular	Waynn Lue	2013-09-12	1	-2/+2
* \| \| \|	Merge pull request #12391 from francisgo/patch-10	Yves Senn	2013-09-28	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Migrations Guide: Fix line length [ci skip]	Francis Go	2013-09-28	1	-2/+2
\|/ / /
* \| \|	adding a test to demonstrate how to use STI subclasses on the far right	Aaron Patterson	2013-09-27	3	-0/+10
* \| \|	Merge pull request #12388 from rkofman/master	Jeremy Kemper	2013-09-27	1	-1/+1
\|\ \ \
\| * \| \|	Fixed grammatical typo in configuring.md guide.	Roman Kofman	2013-09-27	1	-1/+1
\|/ / /
* \| \|	Merge pull request #12385 from francisgo/patch-8	Guillermo Iguaran	2013-09-27	1	-0/+2
\|\ \ \
\| * \| \|	Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip]	Francis Go	2013-09-28	1	-0/+2
\|/ / /
* \| \|	Merge pull request #12366 from francisgo/patch-4	Yves Senn	2013-09-27	1	-1/+1
\|\ \ \
\| * \| \|	Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip]	Francis Go	2013-09-27	1	-1/+1
* \| \| \|	Merge pull request #12233 from claudiob/delete-actionpack-unused-fixture	Yves Senn	2013-09-27	1	-5/+0
\|\ \ \ \
\| * \| \| \|	Remove HelperyTestHelper not used in any test	claudiob	2013-09-14	1	-5/+0
* \| \| \| \|	Merge pull request #12379 from francisgo/patch-7	Yves Senn	2013-09-27	1	-0/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Add new line after create action on CommentsController code example	Francis Go	2013-09-27	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #12376 from tvdeyen/cache-digests-rake-tasks	Rafael Mendonça França	2013-09-26	2	-0/+21
\|\ \ \ \
\| * \| \| \|	Adds template dependencies rake task from cache_digests gem.	Thomas von Deyen	2013-09-26	2	-0/+21
\|/ / / /
* \| \| \|	Merge pull request #12338 from JuanitoFatas/generator	Yves Senn	2013-09-26	1	-3/+18
\|\ \ \ \
\| * \| \| \|	[ci skip] Update scaffold output and change some words.	Juanito Fatas	2013-09-27	1	-3/+18
* \| \| \| \|	Merge pull request #12373 from francisgo/patch-6	Yves Senn	2013-09-26	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Getting Started Guide: post.rb -> Post	Francis Go	2013-09-26	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #12371 from cciollaro/master	Yves Senn	2013-09-26	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] escape unintended url in docs	Chris Ciollaro	2013-09-26	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #12349 from odigity/master	Yves Senn	2013-09-26	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	added "id: false" to HABTM join table example	Ofer Nave	2013-09-24	1	-1/+1
* \| \| \| \| \|	Merge pull request #12356 from francisgo/patch-3	Yves Senn	2013-09-26	1	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Getting Started Guide: posts_controller -> PostsController [ci skip]	Francis Go	2013-09-26	1	-3/+3
* \| \| \| \| \| \|	Merge pull request #12357 from JuanitoFatas/AR-basics	Yves Senn	2013-09-26	1	-11/+11
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Add missing periods and update link name and some wording.	Juanito Fatas	2013-09-26	1	-11/+11
\| \|/ / / / / /
* \| \| \| \| \| \|	quote `false` reference in querying guide.	Yves Senn	2013-09-26	1	-1/+1