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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Describe precision + scale in migrations	Taryn East	2013-12-20	1	-4/+4
* \| \| \| \| \|	Merge pull request #13412 from arthurnn/quote_id_not_id	Rafael Mendonça França	2013-12-19	2	-1/+10
\|\ \ \ \ \ \
\| * \| \| \| \| \|	quoting: Check if id is a valid method before using it	Arthur Neves	2013-12-19	2	-1/+10
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #13411 from schneems/schneems/runner-command-dash-c	Rafael Mendonça França	2013-12-19	1	-5/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make `rails runner` command options more obvious	schneems	2013-12-19	1	-5/+14
* \| \| \| \| \| \|	Improve CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-12-19	1	-8/+6
* \| \| \| \| \| \|	Merge pull request #13344 from ccutrer/fix-from-default-select	Rafael Mendonça França	2013-12-19	3	-1/+26
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	fix default select when from is used	Cody Cutrer	2013-12-19	3	-1/+26
\|/ / / / / /
* / / / / /	Fix indent in PG array tests	Carlos Antonio da Silva	2013-12-19	1	-5/+5
\|/ / / / /
* \| \| \| \|	Make sure multiline string is not accepted by the regexp	Rafael Mendonça França	2013-12-19	2	-2/+10
* \| \| \| \|	Make possible to use symbol as the verifier name	Rafael Mendonça França	2013-12-19	4	-11/+10
* \| \| \| \|	Change the message verifier argument to verifier_name	Rafael Mendonça França	2013-12-19	2	-8/+8
* \| \| \| \|	revises the release notes about message verifiers (second take) [ci skip]	Xavier Noria	2013-12-19	1	-8/+11
* \| \| \| \|	Revert "revises the release notes about message verifiers [ci skip]"	Xavier Noria	2013-12-19	2	-12/+9
* \| \| \| \|	revises the release notes about message verifiers [ci skip]	Xavier Noria	2013-12-19	2	-9/+12
* \| \| \| \|	Merge pull request #13408 from JuanitoFatas/remove-tt	Rafael Mendonça França	2013-12-19	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Remove <tt> tag in 4_1_release notes. [ci skip].	Juanito Fatas	2013-12-20	1	-2/+2
* \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-12-20	21	-28/+30
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Revert "Update contributing_to_ruby_on_rails.md"	Vijay Dev	2013-12-19	1	-1/+1
\| * \| \| \| \|	Revert "Update security.md"	Vijay Dev	2013-12-19	1	-1/+1
\| * \| \| \| \|	Revert "Fix on-site markdown rendering [ci skip]"	Vijay Dev	2013-12-19	1	-1/+1
\| * \| \| \| \|	Revert "Underscore in markdown should be escaped with backslash [ci skip]"	Vijay Dev	2013-12-19	1	-1/+1
\| * \| \| \| \|	[ci skip] add `assets.raise_runtime_errors` flag	schneems	2013-12-14	1	-2/+4
\| * \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Kuldeep Aggarwal	2013-12-10	1	-1/+1
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	aditya-kapoor	2013-12-10	588	-6771/+10534
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	aditya-kapoor	2013-09-01	301	-2671/+3921
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	fixed a typo	aditya-kapoor	2013-08-20	1	-1/+1
\| * \| \| \| \| \| \| \|	fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]	Kuldeep Aggarwal	2013-12-10	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove an extra period	Robin Dupret	2013-12-04	1	-1/+1
\| * \| \| \| \| \| \|	Typos. return -> returns. [ci skip]	Lauro Caetano	2013-12-03	16	-23/+23