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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't convert params if the request isn't HTML - fixes #5341	Andrew White	2012-04-29	1	-6/+18
\|
*	Avoid calling content type multiple times	José Valim	2012-04-29	1	-4/+6
\|
*	Merge pull request #2321 from omjokine/master	José Valim	2012-04-29	1	-1/+4
\|\ \| \| \| \|	JSONP should use mimetype application/javascript
\| *	Merge remote-tracking branch 'upstream/master'	Olli Jokinen	2011-12-01	29	-102/+134
\| \|\
\| * \|	Change mimetype to Mime::JS if JSONP is used	Olli Jokinen	2011-07-28	1	-1/+4
\| \| \|
* \| \|	Merge session arg with existing session instead of overwriting	Andrew White	2012-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529.
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-28	2	-4/+4
\|\ \ \
\| * \| \|	Use <tt>Foo::Bar</tt> instead of +Foo::Bar+	Mark Rushakof	2012-04-27	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::\|\w)+)(\+)
* \| \| \|	remove unnecessary else statement	Vasiliy Ermolovich	2012-04-26	1	-3/+3
\|/ / /
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-18	1	-1/+1
\|\ \ \
\| * \| \|	Fix HTML sanitizer allowed_css_properties comment	Alexey Vakhov	2012-04-13	1	-1/+1
\| \| \| \|
* \| \| \|	Remove obsolete code	Alexey Vakhov	2012-04-12	1	-3/+0
\| \| \| \|
* \| \| \|	#send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so ↵	Jeremy Kemper	2012-04-12	1	-1/+21
\|/ / / \| \| \| \| \| \| \| \| \|	opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
* \| \|	Merge pull request #5748 from ai/no_type_in_html5	Jeremy Kemper	2012-04-08	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Remove unnecessary in HTML 5 type attribute with default value
\| * \| \|	Remove unnecessary in HTML 5 type attribute with default value	Andrey A.I. Sitnik	2012-04-05	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-05	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Add AC record identifier example with not-persisted object	Alexey Vakhov	2012-04-05	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4446 from ayamomiji/patch-1	José Valim	2012-04-05	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	prevent the cache sweeper ignores NoMethodError
\| * \| \| \|	prevent the cache sweeper ignores NoMethodError	ayaya	2012-03-29	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5716 from jurriaan/tr-gsub-cleanup	Santiago Pastorino	2012-04-04	3	-3/+3
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Updated/changed unneeded tr/gsubs
\| * \| \| \|	Updated/changed useless tr/gsubs	Jurriaan Pruis	2012-04-03	3	-3/+3
\| \| \| \| \|
* \| \| \| \|	Fix AC responder example	Alexey Vakhov	2012-04-04	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Remove non-obligatory params in AC respond_to examples	Alexey Vakhov	2012-04-03	1	-2/+2
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-01	1	-1/+0
\|\ \ \ \
\| * \| \| \|	CSRF messages are no longer controlled by 422.html because ↵	Tony Primerano	2012-03-28	1	-1/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	InvalidAuthenticityToken is not raised
* \| \| \|	Remove obsolete reader from AC::MethodNotAllowed exception class	Alexey Vakhov	2012-03-31	1	-2/+0
\| \| \| \|
* \| \| \|	Remove AC::RenderError class second declaration	Alexey Vakhov	2012-03-31	1	-3/+0
\|/ / /
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-03-27	2	-2/+2
\|\ \ \
\| * \| \|	Proc objects for caches_page no need controller object	Alexey Vakhov	2012-03-27	1	-1/+1
\| \| \| \|
\| * \| \|	Fix AC actions caching comment	Alexey Vakhov	2012-03-24	1	-1/+1
\| \| \| \|
* \| \| \|	Don't ignore non Enumerable values passed to sanitize (closes #5585)	Piotr Sarnacki	2012-03-27	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed.
* \| \| \|	ActionController caching small String#split optimization	Alexey Vakhov	2012-03-24	1	-2/+2
\|/ / /
* \| \|	We dont need to merge in the parameters as thats all being reset by the rack ↵	David Heinemeier Hansson	2012-03-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
* \| \|	respond_with description: changed 'response' to 'format'	Mark Thomson	2012-03-18	1	-1/+1
\| \| \|
* \| \|	Revised comments for respond_with	Mark Thomson	2012-03-18	1	-17/+18
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/master'	Mark Thomson	2012-03-17	12	-56/+86
\|\ \ \
\| * \| \|	fixed - warning: instance variable @controller not initialized	Sandeep	2012-03-16	1	-0/+5
\| \| \| \|
\| * \| \|	strip null bytes from Location header as well	Brian Lopez	2012-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add tests for stripping \r\n chars since that's already happening
\| * \| \|	Simplify helpers handling. Ensure Metal can run AC hooks.	José Valim	2012-03-15	4	-35/+34
\| \| \| \|
\| * \| \|	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.
\| * \| \|	Remove --http.	José Valim	2012-03-14	1	-134/+0
\| \| \| \|
\| * \| \|	Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored	Piotr Sarnacki	2012-03-14	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Don't ignore call to undefined method in Sweeper
\| \| * \| \|	Don't ignore call to undefined method in Sweeper	Levente Bagi	2012-03-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add ActionController::HTTP	Santiago Pastorino	2012-03-14	5	-6/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
\| * \| \| \|	Remove Active Resource source files from the repository	Prem Sichanugrist	2012-03-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-03-13	1	-1/+24
\| \|\ \ \ \
\| * \| \| \| \|	'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.