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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into c...	Matt Jones	2012-02-04	2	-4/+18
\|\
\| *	Fix ActiveResource JSON error parser and incorrect tests	Denis Odorcic	2011-09-16	2	-4/+18
* \|	Merge pull request #4865 from bogdan/deprecate_per_key	José Valim	2012-02-03	2	-8/+6
\|\ \
\| * \|	AC::Callbacks: remove usage of :per_key option from filters	Bogdan Gusiev	2012-02-03	2	-8/+6
* \| \|	Merge pull request #4863 from norman/unicode	Vijay Dev	2012-02-03	1	-0/+2
\|\ \ \
\| * \| \|	Added note about new Unicode version.	Norman Clarke	2012-02-03	1	-0/+2
* \| \| \|	Merge pull request #4862 from norman/unicode	José Valim	2012-02-03	3	-1/+1
\|\\| \| \|
\| * \| \|	Update Unicode database to recently-released 6.1.	Norman Clarke	2012-02-03	3	-1/+1
* \| \| \|	Merge pull request #4861 from arunagw/verbose_test_output	José Valim	2012-02-03	6	-0/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Verbose output for tests.	Arun Agrawal	2012-02-03	6	-0/+6
\|/ / /
* \| \|	Merge pull request #4860 from carlosantoniodasilva/generators-hide-namespace	José Valim	2012-02-03	4	-1/+25
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add convenience method to hide a generator from the available ones	Carlos Antonio da Silva	2012-02-03	4	-1/+25
\|/ /
* \|	Merge pull request #4856 from ihid/store_null_bug	Aaron Patterson	2012-02-02	4	-3/+16
\|\ \
\| * \|	Allow store to be a not null column.	Jeremy Walker	2012-02-02	4	-3/+16
* \| \|	*args is already an array. :'(	Aaron Patterson	2012-02-02	1	-1/+1
* \| \|	Merge pull request #4853 from rafaelfranca/fix-build-again	Aaron Patterson	2012-02-02	2	-6/+5
\|\ \ \
\| * \| \|	columns method doesn't have name argument	Rafael Mendonça França	2012-02-02	2	-6/+5
\|/ / /
* \| \|	removed whitespace errors :yellow_heart::blue_heart::purple_heart::heart::gre...	Aaron Patterson	2012-02-02	1	-4/+4
* \| \|	Merge pull request #4851 from carlosantoniodasilva/collection-helpers	José Valim	2012-02-02	10	-51/+793
\|\ \ \
\| * \| \|	Remove default class to collection_check_boxes and	Rafael Mendonça França	2012-02-02	6	-36/+36
\| * \| \|	Allow collection radio_buttons/check_boxes to access current text/value	Carlos Antonio da Silva	2012-02-02	3	-0/+60
\| * \| \|	Add changelog, docs and guides entries	Carlos Antonio da Silva	2012-02-02	4	-20/+193
\| * \| \|	Allow proc for value/text method in collection_select	Carlos Antonio da Silva	2012-02-02	3	-16/+48
\| * \| \|	Move collection radio buttons / check boxes back to FormOptionsHelper	Carlos Antonio da Silva	2012-02-02	4	-92/+81
\| * \| \|	Extract common collection helpers to a module to avoid too much inheritance	Carlos Antonio da Silva	2012-02-02	3	-69/+93
\| * \| \|	Create a Builder factory class to use with collection helpers + block	Carlos Antonio da Silva	2012-02-02	3	-21/+45
\| * \| \|	Refactor collection helpers to extract radio/checkbox/label calls	Carlos Antonio da Silva	2012-02-02	2	-8/+18
\| * \| \|	Remove collection_wrapper* and item_wrapper* options	Carlos Antonio da Silva	2012-02-02	4	-218/+15
\| * \| \|	Refactor value sanitization logic	Carlos Antonio da Silva	2012-02-02	2	-8/+16
\| * \| \|	Cleanup options helper methods a bit	Carlos Antonio da Silva	2012-02-02	1	-12/+12
\| * \| \|	Refactor option groups to use content_tag	Carlos Antonio da Silva	2012-02-02	1	-4/+4
\| * \| \|	Add basic documentation to collection_check_boxes and	Rafael Mendonça França	2012-02-02	1	-0/+71
\| * \| \|	Use @output_buffer variable instead of concat in tests	Carlos Antonio da Silva	2012-02-02	1	-10/+9
\| * \| \|	Implement skipped test	Rafael Mendonça França	2012-02-02	1	-3/+5
\| * \| \|	Add collection_radio_buttons and collection_check_boxes to FormBuilder	Rafael Mendonça França	2012-02-02	2	-9/+30
\| * \| \|	Refactor the methods to use instance variables	Rafael Mendonça França	2012-02-02	3	-22/+26
\| * \| \|	Change Tag class to Category since there is another Tag class	Rafael Mendonça França	2012-02-02	1	-33/+33
\| * \| \|	Refactor render_collection method	Rafael Mendonça França	2012-02-02	2	-13/+9
\| * \| \|	Move collection_check_boxes and collection_radio_buttons to they our	Rafael Mendonça França	2012-02-02	3	-8/+15
\| * \| \|	Add collection_check_boxes helper	Carlos Antonio da Silva	2012-02-02	4	-1/+262
\| * \| \|	Create collection_radio_buttons helper	Carlos Antonio da Silva	2012-02-02	4	-15/+279
* \| \| \|	Merge pull request #4850 from smartinez87/useless_arg	Aaron Patterson	2012-02-02	6	-7/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove useless argument in #columns.	Sebastian Martinez	2012-02-02	6	-7/+7
\|/ / /
* \| \|	Merge pull request #4849 from carlosantoniodasilva/checkbox-hidden-form	José Valim	2012-02-02	3	-4/+18
\|\ \ \
\| * \| \|	Replicate :form html5 attribute to hidden field for check_box	Carlos Antonio da Silva	2012-02-02	3	-4/+18
\|/ / /
* \| \|	Merge pull request #3892 from arunagw/verbose_rake_test	José Valim	2012-02-02	3	-3/+0
\|\ \ \
\| * \| \|	No verbose the output for tests.	Arun Agrawal	2012-02-01	3	-3/+0
* \| \| \|	Merge pull request #4842 from jamesarosen/master	José Valim	2012-02-01	1	-8/+5
\|\ \ \ \
\| * \| \| \|	updating documentation for register_template_handler	James A. Rosen	2012-02-01	1	-8/+5
* \| \| \| \|	use the class method to (un)escape binary values	Aaron Patterson	2012-02-01	1	-2/+2
\|/ / / /