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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #12407 from senny/extract_next_migration_number_into_module	Yves Senn	2013-09-30	3	-8/+24
\|\
\| *	Make `.next_migration_number` reusable for third party AR generators.	Yves Senn	2013-09-30	3	-8/+24
\|/
*	Add changlog entry for #10844	Andrew White	2013-09-30	1	-0/+7
*	Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ta...	Andrew White	2013-09-30	2	-1/+11
\|\
\| *	make sure both headers are set before checking for ip spoofing	Tamir Duberstein	2013-06-04	2	-1/+11
* \|	fix `test_sqlite3_mem` test run.	Yves Senn	2013-09-30	1	-0/+1
* \|	Merge pull request #12383 from marclennox/master	Rafael Mendonça França	2013-09-29	2	-2/+11
\|\ \
\| * \|	Fixed issue #12327	Marc Lennox	2013-09-27	2	-2/+11
* \| \|	Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unpermitted...	Rafael Mendonça França	2013-09-28	1	-1/+1
\|\ \ \
\| * \| \|	fixes incorrect spelling of `action_on_unpermitted_parameters`	Jared Beck	2013-09-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #12354 from kennyj/fix_12293	Rafael Mendonça França	2013-09-28	3	-1/+26
\|\ \ \
\| * \| \|	Strong parameters should permit nested number as key. Closes #12293	kennyj	2013-09-27	3	-1/+26
* \| \| \|	Merge pull request #12387 from francisgo/patch-9	Rafael Mendonça França	2013-09-28	1	-14/+14
\|\ \ \ \
\| * \| \| \|	Migrations Guide: Add semicolon to sentences before code block [ci skip]	Francis Go	2013-09-28	1	-14/+14
* \| \| \| \|	Merge pull request #12398 from thedarkone/thread-safety-stuff	Rafael Mendonça França	2013-09-28	3	-25/+35
\|\ \ \ \ \
\| * \| \| \| \|	Make GTG::TransTable thread safe.	thedarkone	2013-09-28	1	-12/+23
\| * \| \| \| \|	Use TS::Cache instead of Mutex + Hash.	thedarkone	2013-09-28	1	-12/+8
\| * \| \| \| \|	Replace global Hash with TS::Cache.	thedarkone	2013-09-28	1	-1/+4
* \| \| \| \| \|	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
\|\ \ \ \ \ \