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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'docrails/master'	Xavier Noria	2013-01-26	6	-4/+98
\|\
\| *	generic pass before merging docrails	Xavier Noria	2013-01-26	4	-422/+62
\| *	:scissors: "raise" duplication	Akira Matsuda	2013-01-26	1	-2/+1
\| *	Review #translate docs [ci skip]	Carlos Antonio da Silva	2013-01-20	1	-8/+7
\| *	Add documentation for abstract controller #translate and #localize method.	Jens Bissinger	2013-01-20	1	-0/+10
\| *	Add documentation to ActionDispatch::Response	Matthew Stopa	2013-01-20	1	-0/+7
\| *	fix broken examples format in image_tag helper [ci skip]	Francesco Rodriguez	2013-01-18	1	-0/+2
\| *	repeating documentation for option form helpers	Thiago Pinto	2013-01-17	1	-0/+286
\| *	repeating documentation for date and time form helpers	Thiago Pinto	2013-01-17	1	-0/+148
\| *	Fix typo introduced in 0004ca3a	Carlos Antonio da Silva	2013-01-16	1	-1/+1
\| *	More documentation for ActionDispatch::Response	Matthew Stopa	2013-01-16	1	-1/+3
\| *	Document ActionDispatch::Response#body method	Matthew Stopa	2013-01-16	1	-0/+1
* \|	Add keys/values methods to TestSession	Carlos Antonio da Silva	2013-01-25	2	-5/+19
* \|	Integrate Action Pack with Rack 1.5	Carlos Antonio da Silva	2013-01-25	8	-19/+37
* \|	use the helpers list rather than getting the methods from the module	Aaron Patterson	2013-01-24	1	-1/+1
* \|	module_eval is not necessary here	Aaron Patterson	2013-01-24	1	-3/+1
* \|	don't need to eval everything	Aaron Patterson	2013-01-24	1	-1/+1
* \|	Set Thread.abort_on_exception for the whole AS, AP, and AR tests	Akira Matsuda + Koichi Sasada	2013-01-24	1	-0/+2
* \|	ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]	Xavier Noria	2013-01-23	2	-3/+7
* \|	Lets kepp using Ruby 1.9 syntax	Rafael Mendonça França	2013-01-22	2	-37/+37
* \|	Only check for unpermmited parameters if	Rafael Mendonça França	2013-01-22	1	-1/+1
* \|	avoid creating an object in every call	Xavier Noria	2013-01-22	1	-1/+2
* \|	Remove tabs, use spaces :scissors:	Carlos Antonio da Silva	2013-01-22	1	-2/+2
* \|	Merge branch 'isolating_tests'	Akira Matsuda	2013-01-22	2	-2/+12
\|\ \
\| * \|	Restore I18n.locale after running tests	Akira Matsuda	2013-01-22	1	-1/+7
\| * \|	Make sure to reset default_url_options	Akira Matsuda	2013-01-22	1	-1/+5
* \| \|	Stylistic pass at form_helper_test	Rafael Mendonça França	2013-01-21	1	-286/+362
* \| \|	Capture block so content won't leak.	José Mota	2013-01-21	3	-4/+61
* \| \|	Update actionpack's CHANGELOG for 445f14e	Piotr Sarnacki	2013-01-21	1	-0/+5
* \| \|	Fix asset_path in mounted engine	Piotr Sarnacki	2013-01-21	1	-2/+1
\|/ /
* \|	Duplicate possible frozen string from route	Andrew White	2013-01-21	2	-2/+12
* \|	Merge pull request #9014 from virusman/form_helpers_ar_tests	Rafael Mendonça França	2013-01-21	2	-0/+92
\|\ \
\| * \|	Added AR integration tests for form helpers	virusman	2013-01-21	2	-0/+92
* \| \|	Merge pull request #9001 from schneems/schneems/routes-path-js	Rafael Mendonça França	2013-01-21	5	-12/+134
\|\ \ \
\| * \| \|	In Browser Path Matching with Javascript	schneems	2013-01-20	5	-12/+134
* \| \| \|	Fix setting expected value in translation tests	Carlos Antonio da Silva	2013-01-21	1	-2/+2
\| \|/ / \|/\| \|
* \| \|	Merge pull request #9007 from dpree/master	Rafael Mendonça França	2013-01-20	1	-35/+46
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Removed ActionController::Base dependency from abstract controller translatio...	Jens Bissinger	2013-01-20	1	-41/+46
\| * \|	Test abstract controller's localize method.	Jens Bissinger	2013-01-20	1	-0/+6
* \| \|	Refactor grep call to remove .each	Carlos Antonio da Silva	2013-01-20	1	-1/+1
* \| \|	Add missing assert calls	Carlos Antonio da Silva	2013-01-20	1	-2/+2
* \| \|	Use 1.9 hash style in docs/comments [ci skip]	Carlos Antonio da Silva	2013-01-20	1	-3/+3
* \| \|	Fix markdown formatting to highlight block in changelog [ci skip]	Carlos Antonio da Silva	2013-01-20	1	-2/+2
* \| \|	Removing warning: shadowing outer local variable	Arun Agrawal	2013-01-20	1	-3/+3
* \| \|	strong parameters filters permitted scalars	Xavier Noria	2013-01-20	4	-39/+273
\|/ /
* \|	Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency	Aaron Patterson	2013-01-19	2	-3/+9
\|\ \
\| * \|	Don't change the original i18n data	Chris McGrath	2013-01-17	1	-1/+1
\| * \|	Remove i18n symbol dependency	Chris McGrath	2013-01-17	2	-3/+9
* \| \|	Restore and adapt the implementation reverted at	Rafael Mendonça França	2013-01-19	4	-37/+66
* \| \|	Added ability to raise or log on unpermitted params.	Thomas Drake-Brockman	2013-01-20	4	-6/+117