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	2012-02-25	2	-2/+2
\|\
\| *	Fix typo in match :to docs	Justin Woodbridge	2012-02-23	1	-1/+1
\| *	Fix AbstractController#controller_path doc	Alexey Vakhov	2012-02-19	1	-1/+1
* \|	Merge pull request #5117 from nashby/form-option-refactor	José Valim	2012-02-25	1	-17/+11
\|\ \
\| * \|	refactor option_text_and_value and option_value_selected? methods	Vasiliy Ermolovich	2012-02-21	1	-10/+3
\| * \|	refactor time_zone_options_for_select	Vasiliy Ermolovich	2012-02-21	1	-7/+8
* \| \|	Update changelogs with rails 3.0-stable branch info	Paco Guzman	2012-02-25	1	-2/+125
* \| \|	Remove wrong and redundant code.	kennyj	2012-02-25	1	-6/+4
* \| \|	consistently mention first patch, then put	Xavier Noria	2012-02-24	3	-9/+9
* \| \|	uses PATCH for the forms of persisted records, and routes PATCH and PUT to th...	Xavier Noria	2012-02-24	8	-83/+87
* \| \|	correct fetching :name option in form fields	Vasiliy Ermolovich	2012-02-23	2	-3/+8
* \| \|	Document the :host option for force_ssl	Andrew White	2012-02-23	1	-0/+1
* \| \|	Update documentation for force_ssl - closes #5023.	Andrew White	2012-02-23	2	-1/+26
* \| \|	SSL should not be disabled by default in any environment.	Pat Allan	2012-02-23	2	-15/+1
* \| \|	Avoid inspecting the whole route set, closes #1525	José Valim	2012-02-23	1	-0/+6
* \| \|	Merge pull request #5138 from avakhov/remove-unused-global-var	José Valim	2012-02-23	1	-2/+0
\|\ \ \
\| * \| \|	Remove unused global variable in controller filters test	Alexey Vakhov	2012-02-23	1	-2/+0
* \| \| \|	Remove skip_filter block param	Alexey Vakhov	2012-02-23	1	-7/+7
\|/ / /
* \| \|	Merge pull request #5084 from johndouthat/patch-1	Aaron Patterson	2012-02-22	1	-2/+1
\|\ \ \
\| * \| \|	Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022	johndouthat	2012-02-18	1	-2/+1
* \| \| \|	updates CHANGELOGs to register changes in 002713c	Xavier Noria	2012-02-22	1	-0/+11
* \| \| \|	add some tests, yay!	Aaron Patterson	2012-02-22	1	-0/+31
* \| \| \|	Only set ActionView configuration inside the on_load block	Rafael Mendonça França	2012-02-22	1	-1/+1
* \| \| \|	Merge pull request #5132 from rafaelfranca/fix-build	Aaron Patterson	2012-02-22	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix routes inspection order	Rafael Mendonça França	2012-02-22	1	-2/+2
* \| \| \| \|	Merge pull request #5119 from kennyj/fix_5114	Aaron Patterson	2012-02-22	1	-0/+26
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Testcase for GH #5114.	kennyj	2012-02-22	1	-0/+26
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #5130 from dlee/revised_patch_verb	Xavier Noria	2012-02-22	21	-99/+259
\|\ \ \ \
\| * \| \| \|	Add config.default_method_for_update to support PATCH	David Lee	2012-02-22	21	-99/+259
* \| \| \| \|	AS::Callbacks: deprecate rescuable option	Bogdan Gusiev	2012-02-22	1	-3/+9
* \| \| \| \|	format lookup for partials is derived from the format in which the template i...	Santiago Pastorino	2012-02-22	10	-34/+23
\|/ / / /
* \| \| \|	fix bad docs from f373f296 [ci skip]	Vijay Dev	2012-02-21	1	-3/+3
* \| \| \|	Don't wrap the raise with ensure	Santiago Pastorino	2012-02-21	2	-10/+12
* \| \| \|	Refactored two methods to use delete with a block	Ruben Fonseca	2012-02-21	2	-2/+2
* \| \| \|	Restore lookup formats to the previous value after searching for the failing ...	Santiago Pastorino	2012-02-21	2	-2/+5
\|/ / /
* \| \|	use Hash#delete on styelsheet_link_tag	Ruben Fonseca	2012-02-21	1	-3/+3
* \| \|	use Hash#delete with a default block	Aaron Patterson	2012-02-20	1	-3/+3
* \| \|	Merge pull request #5102 from nashby/form-option-refactor	José Valim	2012-02-20	2	-28/+29
\|\ \ \
\| * \| \|	refactor options_for_select	Vasiliy Ermolovich	2012-02-20	2	-23/+24
\| * \| \|	refactor grouped_options_for_select	Vasiliy Ermolovich	2012-02-20	1	-5/+5
* \| \| \|	Fix a failing test	Santiago Pastorino	2012-02-20	1	-0/+2
* \| \| \|	Use the right format when a partial is missing.	Santiago Pastorino	2012-02-20	3	-0/+9
* \| \| \|	Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset	José Valim	2012-02-20	2	-0/+7
* \| \| \|	search private / protected methods in trunk ruby	Aaron Patterson	2012-02-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #5082 from willbryant/assigns_should_not_stringify_values_...	Aaron Patterson	2012-02-20	2	-1/+7
\|\ \ \
\| * \| \|	assigns(:foo) should not convert @foo's keys to strings if it happens to be a...	Will Bryant	2012-02-18	2	-1/+7
\| \|/ /
* \| \|	Merge pull request #5083 from nashby/grouped-select-options	José Valim	2012-02-20	2	-1/+24
\|\ \ \
\| * \| \|	add selected and disabled option to grouped select	Vasiliy Ermolovich	2012-02-18	2	-1/+24
\| \|/ /
* \| \|	Remove fixture files with Windows incompatible filenames	Andrew White	2012-02-20	13	-38/+88
* \| \|	Integration tests support the OPTIONS http method	Jeremy Kemper	2012-02-19	3	-2/+26
\| \|/ \|/\|