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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	1	-0/+15
\|\
\| *	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	1	-0/+10
\| *	fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]	Charlie Somerville	2013-03-15	1	-0/+5
* \|	remove ancient TODOs [ci skip].	Yves Senn	2013-03-18	1	-1/+0
* \|	Allow pass multipart option to form_for	Grzegorz Derebecki	2013-03-17	1	-2/+2
* \|	Fix incorrectly appended square brackets to a multiple select box	Olek Janiszewski	2013-03-08	1	-0/+8
* \|	Add missing require to debug helper test	Carlos Antonio da Silva	2013-03-05	1	-2/+2
* \|	Add DebugHelperTest	robertomiranda	2013-03-05	1	-0/+8
\|/
*	Merge pull request #9366 from killthekitten/fix-content_for-regression	Rafael Mendonça França	2013-02-28	1	-0/+4
\|\
\| *	Fix #9360 regression in content_for	Nikolay Shebanov	2013-02-25	1	-0/+4
* \|	cleanup AP number_helpers_test	Yves Senn	2013-02-27	1	-47/+47
* \|	remove duplicated number_helper tests in AP. They are already in AS.	Yves Senn	2013-02-27	1	-270/+22
* \|	Merge pull request #8530 from dasch/dependency-trackers	David Heinemeier Hansson	2013-02-25	2	-1/+48
\|\ \
\| * \|	Register trackers on extensions, not handlers	Daniel Schierbeck	2013-02-20	2	-5/+6
\| * \|	Return an empty array if no tracker is found	Daniel Schierbeck	2013-02-20	1	-2/+9
\| * \|	Allow registering custom dependency trackers	Daniel Schierbeck	2013-02-20	2	-1/+40
* \| \|	Move number_to_human test from AP to AS	Carlos Antonio da Silva	2013-02-22	1	-5/+0
* \| \|	Address edge case for number_to_human with units option.	hoffm	2013-02-22	1	-0/+5
* \| \|	Merge pull request #9334 from NARKOZ/time_tag	Andrew White	2013-02-21	1	-18/+18
\|\ \ \
\| * \| \|	fix time_tag helper and update tests to not rely on dynamically generated values	Nihad Abbasov	2013-02-22	1	-18/+18
\| \|/ /
* \| /	Revert "Revert "Merge pull request #4803 from lucascaton/master""	Santiago Pastorino	2013-02-21	1	-1/+1
\| \|/ \|/\|
* \|	Use #grep to filter priority zones when a regexp is given	Carlos Antonio da Silva	2013-02-21	1	-2/+4
* \|	Fix test name and refactor fake timezones creation in form options test	Carlos Antonio da Silva	2013-02-21	1	-3/+3
* \|	remove assigned but unused variable warning	Nihad Abbasov	2013-02-21	1	-2/+2
* \|	Revert "Merge pull request #4803 from lucascaton/master"	Santiago Pastorino	2013-02-20	1	-1/+1
\|/
*	Fix time_zone_options_for_select to not mutate TimeZones array	Brian McManus	2013-02-19	1	-0/+7
*	Improve img alt attribute for screen readers	thenickcox	2013-02-09	1	-1/+2
*	partials inside directory work with `assert_template`	Yves Senn	2013-02-04	1	-0/+12
*	descriptive `assert_template` error when partial wasn't rendered	Yves Senn	2013-02-04	1	-0/+9
*	Fix `content_tag_for` with array html option.	Semyon Perepelitsa	2013-01-31	1	-0/+6
*	Make current_url? work with a HEAD method	Michiel Sikkes	2013-01-28	1	-0/+6
*	Use Encoding::UTF_8 constant :do_not_litter:	Akira Matsuda	2013-01-28	2	-5/+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	1	-0/+57
*	Remove i18n symbol dependency	Chris McGrath	2013-01-17	1	-3/+8
*	Fix date_select :selected option so you can pass it nil	Colin Burn-Murdoch	2013-01-16	1	-1/+64
*	Merge pull request #8938 from colinbm/date_select_value	Steve Klabnik	2013-01-14	1	-2/+50
\|\
\| *	Rename :value option to :selected, in line with other select helpers	Colin Burn-Murdoch	2013-01-14	1	-2/+50
* \|	Revert benchmark helper regression. Use a #capture within a #benchmark	Jeremy Kemper	2013-01-14	1	-24/+0
* \|	Merge pull request #8916 from josemota/collection-with-block	Rafael Mendonça França	2013-01-13	1	-0/+49
\|\ \ \| \|/ \|/\|
\| *	Collection radio buttons and collection check boxes through FormBuilder render	José Mota	2013-01-12	1	-0/+49
* \|	Allow value to be set on date_select	Colin Burn-Murdoch	2013-01-13	1	-0/+21
* \|	Associaton -> Association	Steve Klabnik	2013-01-13	1	-2/+2
\|/
*	Merge pull request #8623 from virusman/form_helpers_collectionproxy_fix	Jon Leighton	2013-01-11	1	-0/+23
\|\
\| *	Test nested fields with AssociationProxy mockup & fix AssociationProxy suppor...	virusman	2012-12-27	1	-0/+23
* \|	view_cache_dependency API	Jamis Buck	2013-01-08	1	-2/+16
* \|	set 'alt' attribute for image_submit_tag	Nihad Abbasov	2013-01-08	1	-2/+2
* \|	Do not generate local vars for partials without object or collection	Carlos Antonio da Silva	2013-01-08	1	-0/+7
* \|	Do not call fields_for from form_for, to avoid instantiating two builders	Carlos Antonio da Silva	2013-01-06	1	-1/+13
* \|	deprecate `assert_blank` and `assert_present`.	Yves Senn	2013-01-05	1	-1/+1