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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5421 from parndt/master	Vijay Dev	2012-03-14	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Added missing 'end' to documentation example
\| * \| \| \| \| \| \| \| \| \| \| \|	Added missing end to example	Philip Arndt	2012-03-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Remove sprockets integration on ActionPack	Guillermo Iguaran	2012-03-13	8	-537/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #572 from sikachu/remove_activeresource	José Valim	2012-03-13	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Active Resource source files from the repository.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove Active Resource source files from the repository	Prem Sichanugrist	2012-03-13	2	-3/+3
\| \| \|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu.
* / \| \| \| \| \| \| \| \| \| \| \|	add include_hidden option to checkbox tag	Sergey Nartimov	2012-03-13	1	-2/+8
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-03-13	3	-71/+165
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added documentation for the ActionController::MimeResponds::Collector class.	Mark Thomson	2012-03-13	1	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Revised explanation of fields_for usage.	Mark Thomson	2012-03-11	1	-10/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor tweak to previous comments on form_for and form_helper.rb preamble
\| * \| \| \| \| \| \| \| \| \| \|	Added clarification to description of how initial form values are derived.	Mark Thomson	2012-03-10	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '3.9.12'	Mark Thomson	2012-03-10	1	-53/+84
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Revised explanation of form_for usage	Mark Thomson	2012-03-10	1	-53/+84
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix layout method doc formatting	Alexey Vakhov	2012-03-10	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix comment about layout folders lookup	Alexey Vakhov	2012-03-09	1	-2/+2
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Additional preamble comments in form_helper.rb.	Mark Thomson	2012-03-08	1	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Small correction to the description of the role of the form builder.	Mark Thomson	2012-03-08	1	-1/+1
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(endpoints are generated by form_for without reference to the form builder)
* \| \| \| \| \| \| \| \| \| \|	add 'include_hidden' option to select tag, closes #5402	Vasiliy Ermolovich	2012-03-13	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	'module' is reserved word. Sample of code with error - not cool.	Egor Homakov	2012-03-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Updated description of #retrieve_collector_from_mimes	Mark Thomson	2012-03-13	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5375 from nertzy/assert_template_with_regexp	Aaron Patterson	2012-03-12	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assert_template matches against Regexp
\| * \| \| \| \| \| \| \| \| \| \|	assert_template matches against Regexp	Grant Hutchins	2012-03-10	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows for more strict template assertions, while maintaining backward compatibility. For example, if you use assert_template("foo/bar") and "foo/bar/baz" was rendered, the test passes. But if you use assert_template(%r{\Afoo/bar\Z}), you will catch that a different template was rendered. Also, if you passed an unsupported argument to assert_template() in the past, it would silently succeed. Now it raises an ArgumentError.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator	Aaron Patterson	2012-03-12	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ensure u2029 is escaped in escape_javascript helper
\| * \| \| \| \| \| \| \| \| \| \| \|	ensure u2029 is escaped in escape_javascript helper	benmmurphy	2012-03-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5366 from parndt/fix_issue_5324	José Valim	2012-03-11	4	-21/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix unintended removal of 'cols' from a text_area example.	Philip Arndt	2012-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixes #5324 by removing default size options from input:text and default ↵	Philip Arndt	2012-03-10	4	-22/+17
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cols and rows options from textarea.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5326 from lest/patch-2	Michael Koziarski	2012-03-10	1	-2/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	configure how unverified request will be handled
\| * \| \| \| \| \| \| \| \| \| \|	configure how unverified request will be handled	Sergey Nartimov	2012-03-09	1	-2/+18
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception
* \| \| \| \| \| \| \| \| \| \|	AbstractController.action_methods should return a Set	Santiago Pastorino	2012-03-10	1	-2/+3
\| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-03-09	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-03-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add some docs for ActionController::Base.without_modules	Carlos Antonio da Silva	2012-03-06	1	-0/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Set the rendered_format on respond_to.	José Valim	2012-03-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Just change the formats on first render, closes #5307, closes #5308.	José Valim	2012-03-07	1	-2/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5310 from Serabe/layout_for_partials_with_collections	José Valim	2012-03-06	1	-1/+46
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds :layout option to render :partial when a collection is given.
\| * \| \| \| \| \| \| \| \| \|	Adds line to change log and update documentation.	Sergio Arbeo	2012-03-07	1	-0/+37
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Adds :layout option to render :partial when a collection is given.	Sergio Arbeo	2012-03-06	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Refactor AD::UploadedFile, and raise sooner if tempfile is not present	Carlos Antonio da Silva	2012-03-06	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Remove unused ActionController::SessionManagement	Santiago Pastorino	2012-03-06	3	-11/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Avoid ImplicitRender just call render directly	Santiago Pastorino	2012-03-06	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Clean up module docs [ci skip]	Vijay Dev	2012-03-07	2	-27/+27
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed some useless docstrings and no-doc'ed some.
* \| \| \| \| \| \| \| \| \|	Merge pull request #5298 from sikachu/master-fix-responder	José Valim	2012-03-06	2	-12/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always passing a respond block from to responder
\| * \| \| \| \| \| \| \| \| \|	Always passing a respond block from to responder	Prem Sichanugrist	2012-03-05	2	-12/+13
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280
* / / / / / / / / /	Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵	Dwayne Litzenberger	2012-03-05	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910
* \| \| \| \| \| \| \| \|	Merge pull request #5290 from steveklabnik/master	José Valim	2012-03-05	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added parsing of arbitrary media type parameters.
\| * \| \| \| \| \| \| \| \|	Added parsing of arbitrary media type parameters.	Steve Klabnik	2012-03-05	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on #4918. Related to #4127.
* \| \| \| \| \| \| \| \| \|	force response body to be read in assert_template	Sergey Nartimov	2012-03-05	1	-0/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Route root helper shortcut	Brian Cardarella	2012-03-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow the root route helper to accept just a string
* \| \| \| \| \| \| \| \|	Merge pull request #5246 from lest/patch-2	José Valim	2012-03-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simplify namespace assignment in fields_for
\| * \| \| \| \| \| \| \| \|	simplify namespace assignment in fields_for	Sergey Nartimov	2012-03-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|