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

	Commit message (Expand)	Author	Age	Files	Lines
*	Update CHANGELOG [ci skip]	José Valim	2013-12-23	1	-0/+5
*	Use the new Resolver API in dbconsole	José Valim	2013-12-23	1	-3/+2
*	Add examples and namespace ENV options with "RAILS_"	José Valim	2013-12-23	12	-13/+25
*	Guarantee the connection resolver handles string values	José Valim	2013-12-23	6	-53/+58
*	Do not store production information in .yml files	José Valim	2013-12-23	12	-40/+36
*	Merge pull request #13427 from schneems/schneems/cannot-connect-postgres-error	Yves Senn	2013-12-23	5	-0/+40
\|\
\| *	Tell how to Create a Database in Error Message	schneems	2013-12-23	5	-0/+40
\|/
*	Fix comment example in AR enum [ci skip]	Carlos Antonio da Silva	2013-12-23	1	-1/+1
*	Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_record	Yves Senn	2013-12-23	3	-1/+22
\|\
\| *	On destroying do not touch destroyed belongs to association.	Paul Nikitochkin	2013-12-23	3	-1/+22
\|/
*	Merge pull request #13446 from kuldeepaggarwal/resolver-test-cases	Yves Senn	2013-12-23	1	-0/+10
\|\
\| *	added test cases for Resolver#connection_url_to_hash	Kuldeep Aggarwal	2013-12-23	1	-0/+10
* \|	Merge pull request #13457 from strzalek/add-missing-av-railtie	José Valim	2013-12-23	1	-0/+1
\|\ \
\| * \|	Add missing av/railtie require	Łukasz Strzałkowski	2013-12-22	1	-0/+1
\|/ /
* \|	CHANGELOG entry for #13451. [ci skip]	Yves Senn	2013-12-22	1	-0/+13
* \|	Merge pull request #13451 from dmathieu/quoting_non_strings	Yves Senn	2013-12-22	2	-1/+7
\|\ \
\| * \|	fix quoting non-strings	Damien Mathieu	2013-12-22	2	-1/+7
\|/ /
* \|	Use the same enum definition in the docs and in the comments [ci skip]	Godfrey Chan	2013-12-22	1	-6/+6
* \|	Add comments with urls for email previews	Andrew White	2013-12-22	2	-6/+13
\|/
*	Merge pull request #13443 from schneems/schneems/fix-master-tests	Guillermo Iguaran	2013-12-21	3	-24/+26
\|\
\| *	Use Full path to sqlite database in tests	schneems	2013-12-22	2	-4/+4
\| *	Fix DB Console tests	schneems	2013-12-21	1	-20/+22
\|/
*	Merge pull request #13438 from vipulnsward/enable-memache-on-travis	Guillermo Iguaran	2013-12-21	1	-0/+3
\|\
\| *	Enable memcached service on travis for running cache tests.	Vipul A M	2013-12-22	1	-0/+3
* \|	Merge pull request #13436 from robin850/patch-11	Guillermo Iguaran	2013-12-21	4	-2/+18
\|\ \
\| * \|	Fix few typos in the documentation [ci skip]	Robin Dupret	2013-12-21	2	-2/+2
\| * \|	Add a changelog entry for #13326 [ci skip]	Robin Dupret	2013-12-21	1	-0/+8
\| * \|	Add a changelog entry for #13363 [ci skip]	Robin Dupret	2013-12-21	1	-0/+8
* \| \|	Fix typo [ci skip]	Carlos Antonio da Silva	2013-12-21	1	-1/+1
* \| \|	optimizes array conversion in AC::Parameters	Xavier Noria	2013-12-21	2	-2/+17
\|/ /
* \|	refactors AC::Parameters#fetch	Xavier Noria	2013-12-21	1	-10/+3
* \|	Test with 2.1.0-rc1	Guillermo Iguaran	2013-12-20	1	-1/+1
* \|	Merge pull request #13425 from kassio/master	David Heinemeier Hansson	2013-12-20	7	-8/+39
\|\ \
\| * \|	`html` and `text` templates for mailers by default	Kassio Borges	2013-12-20	7	-8/+39
* \| \|	converts hashes in arrays of unfiltered params to unpermitted params [fixes #...	Xavier Noria	2013-12-21	3	-3/+23
* \| \|	fix url connections for sqlite3	Aaron Patterson	2013-12-20	2	-1/+34
\|/ /
* \|	Merge pull request #13422 from rwz/master	Rafael Mendonça França	2013-12-20	3	-4/+4
\|\ \
\| * \|	Bump Jbuilder version to 2.0.0	Pavel Pravosud	2013-12-20	3	-4/+4
\|/ /
* \|	Merge pull request #13415 from schneems/schneems/database-no-username	Yves Senn	2013-12-19	2	-4/+18
\|\ \
\| * \|	Do not expect database user with app name to exist	schneems	2013-12-19	2	-4/+18
* \| \|	Fix AS::NumberHelper results with large precisions	Kenta Murata & Akira Matsuda	2013-12-20	3	-7/+62
* \| \|	Merge pull request #13188 from imanel/skip_deep_munge	Jeremy Kemper	2013-12-19	4	-0/+33
\|\ \ \
\| * \| \|	Add configuration option to optionally disable deep_munge	Bernard Potocki	2013-12-05	4	-0/+35
* \| \| \|	Merge pull request #13418 from ma2gedev/update_sass_rails_4_0_0	Guillermo Iguaran	2013-12-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use sass-rails 4.0.1	Takayuki Matsubara	2013-12-20	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #13417 from TalkativeTree/comments_change	Richard Schneeman	2013-12-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	change CollectionAssociation's comments to say Association instead of Associa...	Ben Angel	2013-12-19	1	-1/+1
* \| \| \| \|	Merge pull request #13326 from schneems/schneems/add-asset-flag	Guillermo Iguaran	2013-12-19	2	-0/+32
\|\ \ \ \ \
\| * \| \| \| \|	Flag `config.assets.raise_runtime_errors` in dev	schneems	2013-12-19	2	-0/+32
* \| \| \| \| \|	Merge pull request #13357 from taryneast/master	Lauro Caetano	2013-12-19	1	-4/+4
\|\ \ \ \ \ \