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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-30	2	-17/+1
\|\
\| *	Fix typo	Carson McDonald	2013-03-26	1	-1/+1
\| *	Remove duplicated accepts_nested_attributes description	ma2gedev	2013-03-22	1	-16/+0
* \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	1	-5/+5
\|\ \
\| * \|	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	1	-2/+2
\| * \|	fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]	Charlie Somerville	2013-03-15	1	-3/+3
* \| \|	Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks	Carlos Antonio da Silva	2013-03-18	1	-1/+7
\|\ \ \
\| * \| \|	Include I18n fallbacks in :locale lookup context	Juan Barreneche	2013-03-16	1	-1/+7
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #9754 from macksmind/fix_actionpack_warnings	Rafael Mendonça França	2013-03-17	1	-1/+2
\|\ \ \
\| * \| \|	Fix rake test warnings in actionpack	Mack Earnhardt	2013-03-17	1	-1/+2
\| \|/ /
* / /	Allow pass multipart option to form_for	Grzegorz Derebecki	2013-03-17	1	-1/+1
\|/ /
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-10	1	-1/+1
\|\ \
\| * \|	Update capture_helper.rb	Jess Brown	2013-03-06	1	-1/+1
\| \|/
* \|	Fix incorrectly appended square brackets to a multiple select box	Olek Janiszewski	2013-03-08	1	-1/+1
* \|	Fix hash spaces and use 1.9 style hash [ci skip]	Carlos Antonio da Silva	2013-03-07	1	-1/+1
* \|	Merge pull request #9464 from jcoyne/assert_template_file	Rafael Mendonça França	2013-03-07	2	-1/+2
\|\ \
\| * \|	Allow use of assert_template with the :file option.	Justin Coyne	2013-03-01	2	-1/+2
* \| \|	Typo in comment to ActionView::Resolver#find_all	RKushnir	2013-03-06	1	-1/+1
* \| \|	Use gsub intead of tr when the to_str is longer than the from_str	robertomiranda	2013-03-05	1	-1/+1
\| \|/ \|/\|
* \|	change useless gsub to tr	robertomiranda	2013-03-05	1	-1/+1
* \|	change useless gsub to delete	Benjamin Sullivan	2013-03-05	1	-1/+1
\|/
*	Merge pull request #9366 from killthekitten/fix-content_for-regression	Rafael Mendonça França	2013-02-28	1	-1/+1
\|\
\| *	Fix #9360 regression in content_for	Nikolay Shebanov	2013-02-25	1	-1/+1
* \|	remove private attribute? warning	Francesco Rodriguez	2013-02-26	1	-1/+3
* \|	Merge pull request #8530 from dasch/dependency-trackers	David Heinemeier Hansson	2013-02-25	2	-44/+98
\|\ \
\| * \|	Register trackers on extensions, not handlers	Daniel Schierbeck	2013-02-20	1	-6/+11
\| * \|	Rename ErbTracker to ERBTracker	Daniel Schierbeck	2013-02-20	1	-2/+2
\| * \|	Return an empty array if no tracker is found	Daniel Schierbeck	2013-02-20	1	-2/+7
\| * \|	Use a thread safe hash	Daniel Schierbeck	2013-02-20	1	-1/+3
\| * \|	Allow registering custom dependency trackers	Daniel Schierbeck	2013-02-20	1	-1/+14
\| * \|	Extract dependency tracking from Digestor	Daniel Schierbeck	2013-02-20	2	-44/+73
* \| \|	Fix debug helper not inspecting on Exception	Bouke van der Bijl	2013-02-23	1	-1/+1
* \| \|	Merge pull request #9334 from NARKOZ/time_tag	Andrew White	2013-02-21	1	-1/+3
\|\ \ \
\| * \| \|	document setting custom datetime attribute for time_tag helper	Nihad Abbasov	2013-02-22	1	-0/+2
\| * \| \|	fix time_tag helper and update tests to not rely on dynamically generated values	Nihad Abbasov	2013-02-22	1	-1/+1
\| \|/ /
* \| \|	completes pass over the AP changelog [ci skip]	Xavier Noria	2013-02-21	1	-1/+1
* \| \|	Revert "Revert "Merge pull request #4803 from lucascaton/master""	Santiago Pastorino	2013-02-21	1	-2/+2
\| \|/ \|/\|
* \|	Use #grep to filter priority zones when a regexp is given	Carlos Antonio da Silva	2013-02-21	1	-1/+1
* \|	Use Array Difference to calculate the zones array, instead of iterating	Carlos Antonio da Silva	2013-02-21	1	-2/+2
* \|	Revert "Merge pull request #4803 from lucascaton/master"	Santiago Pastorino	2013-02-20	1	-2/+2
\|/
*	Fix time_zone_options_for_select to not mutate TimeZones array	Brian McManus	2013-02-19	1	-1/+1
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-02-15	2	-3/+3
\|\
\| *	Correct bullet content line wrapping	Tim "Roger" Harvey	2013-02-12	1	-1/+1
\| *	Fixing the examples for button_to	Marc Baumbach	2013-02-06	1	-2/+2
* \|	Improve changelog entry from #9221 [ci skip]	Carlos Antonio da Silva	2013-02-11	1	-3/+3
* \|	Improve img alt attribute for screen readers	thenickcox	2013-02-09	1	-3/+17
* \|	partials inside directory work with `assert_template`	Yves Senn	2013-02-04	1	-1/+1
* \|	descriptive `assert_template` error when partial wasn't rendered	Yves Senn	2013-02-04	1	-0/+4
\|/
*	Missing or unneeded require extract_options	Akira Matsuda	2013-02-01	3	-1/+2
*	Fix `content_tag_for` with array html option.	Semyon Perepelitsa	2013-01-31	1	-1/+1