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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	fixed - warning: ambiguous first argument; put parentheses or even spaces	Sandeep	2012-03-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5454 from luke-gru/luke-dev	Piotr Sarnacki	2012-03-15	1	-0/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allow zero-arity proc for AbstrController::layout
\| * \| \| \| \| \|	allow zero-arity proc for AbstrController::layout	Luke Gruber	2012-03-15	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proc without parameters can now be given to AbstractController::layout
* \| \| \| \| \| \|	fix typo in redirect test	Brian Lopez	2012-03-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	strip null bytes from Location header as well	Brian Lopez	2012-03-15	1	-0/+20
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add tests for stripping \r\n chars since that's already happening
* \| \| \| \| \|	Merge pull request #5337 from mreinsch/static_invalid_byte_sequence	Aaron Patterson	2012-03-15	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix ArgumentError being raised in case of invalid byte sequences
\| * \| \| \| \| \|	fix ArgumentError being raised in case of invalid byte sequences	Michael Reinsch	2012-03-08	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove ActionController::TestCase#rescue_action_in_public!	Piotr Sarnacki	2012-03-15	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* \| \| \| \| \| \|	Allow you to force the authenticity_token to be rendered even on remote ↵	David Heinemeier Hansson	2012-03-14	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms if you pass true
* \| \| \| \| \| \|	Do not include the authenticity token in forms where remote: true as ajax ↵	David Heinemeier Hansson	2012-03-14	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms use the meta-tag value
* \| \| \| \| \| \|	Remove --http.	José Valim	2012-03-14	8	-201/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored	Piotr Sarnacki	2012-03-14	1	-0/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't ignore call to undefined method in Sweeper
\| * \| \| \| \| \| \|	Don't ignore call to undefined method in Sweeper	Levente Bagi	2012-03-06	1	-0/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add ActionController::HTTP	Santiago Pastorino	2012-03-14	8	-0/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
* \| \| \| \| \| \| \|	Remove remaining sprockets tests	Guillermo Iguaran	2012-03-13	1	-28/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove tests and fixtures for Sprockets on ActionPack	Guillermo Iguaran	2012-03-13	14	-409/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add include_hidden option to checkbox tag	Sergey Nartimov	2012-03-13	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add 'include_hidden' option to select tag, closes #5402	Vasiliy Ermolovich	2012-03-13	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove unused method	Santiago Pastorino	2012-03-12	1	-4/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5375 from nertzy/assert_template_with_regexp	Aaron Patterson	2012-03-12	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assert_template matches against Regexp
\| * \| \| \| \| \| \| \|	assert_template matches against Regexp	Grant Hutchins	2012-03-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ensure u2029 is escaped in escape_javascript helper
\| * \| \| \| \| \| \| \| \|	ensure u2029 is escaped in escape_javascript helper	benmmurphy	2012-03-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5366 from parndt/fix_issue_5324	José Valim	2012-03-11	2	-165/+165
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
\| * \| \| \| \| \| \| \| \|	Fixes #5324 by removing default size options from input:text and default ↵	Philip Arndt	2012-03-10	2	-165/+165
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cols and rows options from textarea.
* \| \| \| \| \| \| \| \|	Merge pull request #5326 from lest/patch-2	Michael Koziarski	2012-03-10	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	configure how unverified request will be handled
\| * \| \| \| \| \| \| \|	configure how unverified request will be handled	Sergey Nartimov	2012-03-09	1	-2/+2
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	@controller already includes url_helpers in with_routing method	Santiago Pastorino	2012-03-10	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add missing require	Santiago Pastorino	2012-03-10	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	AbstractController.action_methods should return a Set	Santiago Pastorino	2012-03-10	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Add test case for #5307	Carlos Antonio da Silva	2012-03-07	1	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5310 from Serabe/layout_for_partials_with_collections	José Valim	2012-03-06	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds :layout option to render :partial when a collection is given.
\| * \| \| \| \| \| \|	Adds :layout option to render :partial when a collection is given.	Sergio Arbeo	2012-03-06	2	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Refactor AD::UploadedFile, and raise sooner if tempfile is not present	Carlos Antonio da Silva	2012-03-06	1	-1/+1
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5298 from sikachu/master-fix-responder	José Valim	2012-03-06	1	-0/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always passing a respond block from to responder
\| * \| \| \| \| \| \|	Failing test for mime responder respond_with using a block.	Mario Visic	2012-03-05	1	-0/+36
\| \|/ / / / / /
* / / / / / /	Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵	Dwayne Litzenberger	2012-03-05	2	-0/+103
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added parsing of arbitrary media type parameters.
\| * \| \| \| \| \|	Added parsing of arbitrary media type parameters.	Steve Klabnik	2012-03-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on #4918. Related to #4127.
* \| \| \| \| \| \|	force response body to be read in assert_template	Sergey Nartimov	2012-03-05	1	-0/+13
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5269 from ↵	Piotr Sarnacki	2012-03-04	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	castlerock/remove_unwanted_require_karnel_reporting AS/kernel/reporting no where used in ts_isolated
\| * \| \| \| \| \|	AS/kernel/reporting no where used in ts_isolated	Vishnu Atrai	2012-03-04	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Route root helper shortcut	Brian Cardarella	2012-03-03	1	-0/+9
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow the root route helper to accept just a string
* \| \| \| \| \|	Merge pull request #5242 from rails/opt_routes	José Valim	2012-03-02	3	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times.
\| * \| \| \| \| \|	Optimize url helpers.	Sergey Nartimov + José Valim	2012-03-02	3	-9/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix #5238, rendered_format is not set when template is not rendered	Piotr Sarnacki	2012-03-02	1	-2/+6
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Allow fieldsets to be created without a block.	Ben Pickles	2012-03-01	1	-0/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'master-security'	Aaron Patterson	2012-03-01	1	-1/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options Conflicts: actionpack/lib/action_view/helpers/tags/base.rb
\| * \| \| \| \|	fix output safety issue with select options	Sergey Nartimov	2012-02-20	1	-1/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5203 from avakhov/anonymous-controller-layout	Aaron Patterson	2012-02-29	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix layout lookup for anonymous controller