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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #12530 from vipulnsward/remove_thread_safe	Rafael Mendonça França	2013-10-14	1	-13/+0
\|\
\| *	`$SAFE = 4;` has been removed with Ruby 2.1	Vipul A M	2013-10-14	1	-13/+0
\|/
*	Merge pull request #12527 from vipulnsward/sqlite_database_types	Rafael Mendonça França	2013-10-14	1	-18/+16
\|\
\| *	Remove `default_primary_key_type` and extract contains of `native_database_t...	Vipul A M	2013-10-14	1	-18/+16
* \|	Merge pull request #9499 from dmitry/inverse_instance_should_not_be_reloaded_...	Rafael Mendonça França	2013-10-14	3	-2/+24
\|\ \ \| \|/ \|/\|
\| *	Add a note to the changelog for #9499	Dmitry Polushkin	2013-10-13	1	-0/+6
\| *	add inversed accessor to association class	Dmitry Polushkin	2013-10-13	1	-2/+3
\| *	inversed instance should not be reloaded after stale state was changed	Dmitry Polushkin	2013-10-13	2	-2/+17
* \|	Merge pull request #11833 from vipulnsward/remove_autoincrement	Rafael Mendonça França	2013-10-14	2	-15/+3
\|\ \
\| * \|	Remove sqlite specific`supports_autoincrement?` which always defaults to true	Vipul A M	2013-08-10	2	-15/+3
* \| \|	cleanup changelog entry format. [ci skip]	Yves Senn	2013-10-14	1	-2/+4
* \| \|	Extract a function to determine if the default value is a function	Rafael Mendonça França	2013-10-14	1	-1/+5
* \| \|	Push default_function to superclass to avoid method check	Rafael Mendonça França	2013-10-14	3	-15/+18
* \| \|	Dump the default function when the primary key is uuid	Rafael Mendonça França	2013-10-14	2	-2/+3
* \| \|	Merge pull request #12486 from cjolly/newline-eof-structure-sql	Rafael Mendonça França	2013-10-13	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	newline at end of structure.sql file	Chad Jolly	2013-10-13	1	-0/+1
* \| \|	Merge pull request #12518 from vipulnsward/remove_count_options	Rafael Mendonça França	2013-10-13	5	-20/+17
\|\ \ \
\| * \| \|	Stop accepting `options` for `Relation#average`, `Relation#minimum`, `Relatio...	Vipul A M	2013-10-14	3	-12/+12
\| * \| \|	`Relation#count` doesn't use options anymore.	Vipul A M	2013-10-13	3	-8/+5
* \| \| \|	Add nodoc to method	Rafael Mendonça França	2013-10-13	1	-1/+1
* \| \| \|	Merge pull request #12508 from jetthoughts/12415_generate_subqueries_for_rela...	Rafael Mendonça França	2013-10-13	4	-2/+40
\|\ \ \ \
\| * \| \| \|	Generate subquery for Relation passed as array condition for where	Paul Nikitochkin	2013-10-13	4	-2/+40
* \| \| \| \|	Merge pull request #12456 from razielgn/ar-test-fixes	Rafael Mendonça França	2013-10-13	3	-5/+11
\|\ \ \ \ \
\| * \| \| \| \|	Allow methods arity below -1 in assert_responds.	Federico Ravasio	2013-10-08	1	-3/+4
\| * \| \| \| \|	Assert presence of "frozen" in error message, not the full MRI message.	Federico Ravasio	2013-10-08	1	-1/+3
\| * \| \| \| \|	Just change ENV and restore it afterwards.	Federico Ravasio	2013-10-07	1	-1/+4
* \| \| \| \| \|	Merge pull request #12511 from jetthoughts/informative_raise_message_for_inco...	Rafael Mendonça França	2013-10-13	2	-3/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make missed association exception message more informative	Paul Nikitochkin	2013-10-13	2	-3/+9
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #12514 from schuetzm/stdout-logging-with-implicit-developm...	Rafael Mendonça França	2013-10-13	3	-13/+54
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make logging to stdout work again with implicit `development` env	Marc Schütz	2013-10-13	3	-13/+54
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #12491 from shamanime/patch-1	Rafael Mendonça França	2013-10-13	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix wrong variable name used in the select_day method documentation	Jefferson Queiroz Venerando	2013-10-10	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #12493 from drodriguez/patch-1	Rafael Mendonça França	2013-10-13	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Keep code consistent with previous code blocks.	Daniel Rodríguez Troitiño	2013-10-10	1	-2/+2
* \| \| \| \| \| \| \|	Merge pull request #12517 from vipulnsward/destructive_map_am	Rafael Mendonça França	2013-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change `map` to `map!` to save extra array creation on new array	Vipul A M	2013-10-13	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #12516 from vipulnsward/drop_var	Rafael Mendonça França	2013-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Drop unused iterator var	Vipul A M	2013-10-13	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #11791 from versioncontrol/includes_with_persistent_select	Rafael Mendonça França	2013-10-12	3	-1/+15
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fixes #11773 when using includes combined with select, the select statement w...	Edo Balvers	2013-10-08	3	-1/+15
* \| \| \| \| \| \| \|	Merge pull request #12507 from malavbhavsar/doc_patch	Rafael Mendonça França	2013-10-12	2	-2/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Some fixes in docs [ci skip]	Malav Bhavsar	2013-10-11	2	-2/+2
* \| \| \| \| \| \| \| \|	Merge pull request #12512 from sbagdat/patch-1	Andrew White	2013-10-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix a writing mistake	Sıtkı Bağdat	2013-10-12	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Revert "Merge pull request #12480 from iwiznia/master"	Jeremy Kemper	2013-10-11	4	-57/+0
* \| \| \| \| \| \| \|	no reason to do this column addition and subtraction business	Aaron Patterson	2013-10-11	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #12480 from iwiznia/master	Rafael Mendonça França	2013-10-11	4	-0/+57
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	flatten and flatten! methods for ActiveSupport::Duration	Ionatan Wiznia	2013-10-11	4	-0/+57
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #12503 from arunagw/removed-unused-require	Rafael Mendonça França	2013-10-11	1	-1/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	No need to require rbconfig as we are using Gem.ruby	Arun Agrawal	2013-10-11	1	-1/+0
\|/ / / / / / / /