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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8725 from mattdbridges/patch-2	Guillermo Iguaran	2013-01-03	1	-1/+1
\|\
\| *	Typo and grammar fixes in the ActionPack CHANGELOG	Matt Bridges	2013-01-03	1	-1/+1
\|/
*	Merge pull request #8713 from goshakkk/better-error-page	Guillermo Iguaran	2013-01-03	2	-12/+10
\|\
\| *	fix env toggling, improve error page styling	Gosha Arinich	2013-01-03	2	-12/+10
* \|	Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo	Carlos Antonio da Silva	2013-01-03	1	-1/+1
\|\ \
\| * \|	Fix typo on form_tag_helper.rb	Paulo Luis Franchini Casaretto	2013-01-03	1	-1/+1
\|/ /
* \|	Merge pull request #8717 from amatsuda/scaffold_controller_test_patch	Carlos Antonio da Silva	2013-01-03	3	-5/+5
\|\ \
\| * \|	test PATCH method for update action in generated scaffold controller test rat...	Akira Matsuda	2013-01-03	3	-5/+5
* \| \|	Merge pull request #8715 from goshakkk/refactor-mapper	Carlos Antonio da Silva	2013-01-03	1	-9/+4
\|\ \ \
\| * \| \|	refactor Routing::Mapper	Gosha Arinich	2013-01-03	1	-9/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #8714 from utkarshkukreti/faster-gem-install	Carlos Antonio da Silva	2013-01-03	2	-5/+5
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Pass in `--local` when doing `gem install` for local gems.	Utkarsh Kukreti	2013-01-03	2	-5/+5
\|/ /
* \|	Merge pull request #8706 from steveklabnik/ip_precautions	Rafael Mendonça França	2013-01-02	1	-3/+4
\|\ \
\| * \|	Explain the possible precautions	Andre Arko	2013-01-02	1	-3/+4
\|/ /
* \|	Merge pull request #7980 from steveklabnik/issue_7979	Guillermo Iguaran	2013-01-02	5	-113/+166
\|\ \
\| * \|	Restore original remote_ip algorithm.	Andre Arko	2013-01-02	5	-113/+166
\|/ /
* \|	Changelog improvements [ci skip]	Carlos Antonio da Silva	2013-01-02	3	-4/+5
* \|	missing changelog entry for #8682	Akira Matsuda	2013-01-02	1	-0/+4
\|/
*	Merge pull request #8697 from goshakkk/undup	Rafael Mendonça França	2013-01-02	1	-5/+3
\|\
\| *	remove another unnecessary dup	Gosha Arinich	2013-01-02	1	-5/+3
* \|	CVE-2012-5664 options hashes should only be extracted if there are extra para...	Aaron Patterson	2013-01-02	1	-0/+12
* \|	Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash	Rafael Mendonça França	2013-01-02	3	-7/+33
\|\ \
\| * \|	do not append a second slash when using	Yves Senn	2013-01-02	3	-7/+33
\| \|/
* \|	Fixing closing </p>	Guillermo Iguaran	2013-01-02	1	-1/+1
* \|	Merge pull request #8702 from rubys/master	Guillermo Iguaran	2013-01-02	2	-8/+7
\|\ \
\| * \|	Fix a number of validation/style errors:	Sam Ruby	2013-01-02	2	-8/+7
\|/ /
* \|	take into account multipart when calculating tag attributes	Aaron Patterson	2013-01-02	1	-4/+7
* \|	ask the form builder for form tag attributes	Aaron Patterson	2013-01-02	1	-2/+3
* \|	do not mutate the options hash (when we do not need to)	Aaron Patterson	2013-01-02	1	-2/+2
\|/
*	Merge pull request #8694 from goshakkk/undup	Carlos Antonio da Silva	2013-01-02	1	-2/+1
\|\
\| *	remove unnecessary #dup	Gosha Arinich	2013-01-02	1	-2/+1
* \|	Merge pull request #8688 from goshakkk/error-page-toggle	Guillermo Iguaran	2013-01-02	2	-3/+7
\|\ \ \| \|/ \|/\|
\| *	allow toggling dumps instead of just showing	Gosha Arinich	2013-01-02	2	-3/+7
* \|	Merge pull request #8693 from goshakkk/flatten	Rafael Mendonça França	2013-01-02	1	-2/+2
\|\ \
\| * \|	replace #flatten with Array()	Gosha Arinich	2013-01-02	1	-2/+2
* \| \|	Merge pull request #8692 from lucasmazza/error-page-css	Rafael Mendonça França	2013-01-02	1	-12/+13
\|\ \ \
\| * \| \|	Cleanup some unnecessary CSS on the new error page and reformat some lines.	Lucas Mazza	2013-01-02	1	-12/+13
\| \|/ /
* \| \|	Merge pull request #8691 from acapilleri/preload_association	Rafael Mendonça França	2013-01-02	1	-1/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	refactoring to_sym of Symbol in preload	Angelo capilleri	2013-01-02	1	-1/+3
* \| \|	Merge pull request #8689 from goshakkk/error-page	Rafael Mendonça França	2013-01-02	1	-0/+4
\|\ \ \
\| * \| \|	add source line padding	Gosha Arinich	2013-01-02	1	-0/+4
\| \| \|/ \| \|/\|
* / \|	No need to pass a empty block to content_tag_for anymore	Rafael Mendonça França	2013-01-02	1	-11/+11
\|/ /
* \|	Make content_tag_for work without block	Rafael Mendonça França	2013-01-02	3	-1/+17
* \|	Merge pull request #8686 from mekishizufu/changelog_entry	Xavier Noria	2013-01-02	1	-0/+4
\|\ \ \| \|/ \|/\|
\| *	Add missing changelog entry for #8676 [ci skip]	Jiri Pospisil	2013-01-02	1	-0/+4
\|/
*	Merge pull request #8682 from amatsuda/rm_as_frozen_object_error	Guillermo Iguaran	2013-01-01	7	-12/+4
\|\
\| *	remove meaningless AS::FrozenObjectError	Akira Matsuda	2013-01-02	7	-12/+4
* \|	Standardize the use of current_adapter?	Rafael Mendonça França	2013-01-01	9	-19/+19
* \|	Merge pull request #8678 from yahonda/remove_column_oracle	Rafael Mendonça França	2013-01-01	1	-2/+3
\|\ \
\| * \|	Address a failure test_remove_column_with_multi_column_index with Oracle data...	Yasuo Honda	2013-01-02	1	-2/+3
\| \|/