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

	Commit message (Expand)	Author	Age	Files	Lines
*	Avoid Skip in test, have a unified test for order	Gaurish Sharma	2013-08-09	1	-10/+7
*	Add tests for ActiveModel::Serializers::JSON#as_json ordering	Gaurish Sharma	2013-08-09	1	-1/+10
*	Merge pull request #11806 from jetthoughts/change_model_term_by_simple_word	Carlos Antonio da Silva	2013-08-08	1	-1/+1
\|\
\| *	Remove using of suffix with term. [ci skip]	Paul Nikitochkin	2013-08-08	1	-1/+1
\|/
*	Merge pull request #11802 from ko1/fix_field_encoding_for_mysql	Aaron Patterson	2013-08-07	4	-3/+14
\|\
\| *	Set field encoding to client_encoding for mysql adapter.	Koichi Sasada	2013-08-08	4	-3/+14
* \|	cast hstore values on write to be consistent with reading from the db.	Yves Senn	2013-08-08	4	-4/+34
\|/
*	Merge pull request #11331 from vipulnsward/remove_conditional	Aaron Patterson	2013-08-07	1	-8/+1
\|\
\| *	Remove conditional, since results are always an instance of `ActiveRecord::Re...	Vipul A M	2013-07-06	1	-8/+1
* \|	use `skip` so we can see what tests are not run	Aaron Patterson	2013-08-08	1	-6/+5
* \|	Fix multidimensional PG arrays containing non-string items	Yves Senn	2013-08-07	3	-15/+32
* \|	Merge pull request #11789 from gaurish/multibyte_methods	Steve Klabnik	2013-08-07	1	-3/+4
\|\ \
\| * \|	Avoid defining multibyte method names in JSON decoding test for JRuby Compat	Gaurish Sharma	2013-08-07	1	-3/+4
* \| \|	Merge pull request #10045 from senny/document_relative_url_root	Yves Senn	2013-08-07	1	-2/+39
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	document how to deploy to a subdirectory. #2992 [ci skip]	Yves Senn	2013-08-07	1	-2/+39
* \| \|	skip `test_unicode_column_name` for `MysqlAdapter`.	Yves Senn	2013-08-07	1	-3/+6
* \| \|	RDoc tweaks	Xavier Noria	2013-08-07	1	-5/+10
* \| \|	Merge pull request #11784 from davetoxa/patch-2	Carlos Antonio da Silva	2013-08-06	1	-1/+1
\|\ \ \
\| * \| \|	Bump ruby version [ci skip]	Anton Cherepanov	2013-08-07	1	-1/+1
* \| \| \|	Merge pull request #11783 from davetoxa/patch-1	Carlos Antonio da Silva	2013-08-06	1	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Bump ruby version [ci skip]	Anton Cherepanov	2013-08-07	1	-3/+3
\|/ / /
* \| \|	test to express that we can't turn non-array columns to array columns.	Yves Senn	2013-08-06	1	-0/+9
* \| \|	Merge pull request #11780 from thedarkone/logger-naked-rescue-fix	Guillermo Iguaran	2013-08-06	2	-3/+7
\|\ \ \
\| * \| \|	"Naked" rescue clauses only catch StandardError subclasses.	thedarkone	2013-08-06	2	-3/+6
\| * \| \|	Add a missing require.	thedarkone	2013-08-06	1	-0/+1
\|/ / /
* \| \|	Use the proper encoding comment on the file	Rafael Mendonça França	2013-08-06	1	-0/+2
* \| \|	Fix indentation	Rafael Mendonça França	2013-08-06	1	-3/+2
* \| \|	asakusa.rb hack night!	Aaron Patterson + Akira Matsuda	2013-08-06	2	-0/+5
* \| \|	Add CHANGELOG entry for #11767	Rafael Mendonça França	2013-08-06	1	-0/+4
* \| \|	Merge pull request #11778 from jetthoughts/11759_update_assets_guides	Rafael Mendonça França	2013-08-06	1	-2/+2
\|\ \ \
\| * \| \|	#11759: Update Assets Pipeline Guide	Paul Nikitochkin	2013-08-06	1	-2/+2
* \| \| \|	adding a weird test case	Aaron Patterson	2013-08-06	2	-0/+8
\|/ / /
* \| \|	Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_words	Rafael Mendonça França	2013-08-05	1	-5/+7
\|\ \ \
\| * \| \|	Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words	Alex Tambellini	2013-08-05	1	-5/+7
\|/ / /
* \| \|	Merge pull request #11743 from gaurish/tmp-magic	Guillermo Iguaran	2013-08-05	1	-0/+0
\|\ \ \
\| * \| \|	Add tmp dir in actionview/test/	Gaurish Sharma	2013-08-05	1	-0/+0
* \| \| \|	config[:database] should be a string	Rafael Mendonça França	2013-08-05	1	-3/+3
* \| \| \|	Remove deprecated branch on the scope method.	Rafael Mendonça França	2013-08-05	1	-6/+2
* \| \| \|	Use the right instrumentation name	Rafael Mendonça França	2013-08-05	3	-3/+7
* \| \| \|	Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folder	Rafael Mendonça França	2013-08-05	5	-4/+17
\|\ \ \ \
\| * \| \| \|	load fixtures from linked folders	Kassio Borges	2013-08-05	5	-4/+17
* \| \| \| \|	Merge pull request #11666 from prathamesh-sonpatki/doc-fix	Xavier Noria	2013-08-05	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Removed confusing statements about routes in getting started guide [ci skip]	Prathamesh Sonpatki	2013-08-05	1	-3/+3
* \| \| \| \| \|	Merge pull request #11762 from peterkovacs/patch-2	Carlos Antonio da Silva	2013-08-05	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Free result_metadata directly instead of freeing 2nd, redundant call.	Peter Kovacs	2013-08-05	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11763 from schneems/schneems/create-sqlite3db	José Valim	2013-08-05	3	-3/+30
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Create sqlite3 directory if not present	schneems	2013-08-05	3	-3/+30
\|/ / / / /
* \| \| \| \|	migrations guide: fix and edits [ci skip]	Xavier Noria	2013-08-05	1	-7/+9
* \| \| \| \|	getting started guide: pass the resource to the URL helper [ci skip]	Xavier Noria	2013-08-05	1	-1/+1
* \| \| \| \|	Merge pull request #11760 from rahul100885/master	Rafael Mendonça França	2013-08-05	1	-0/+1
\|\ \ \ \ \