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

	Commit message (Expand)	Author	Age	Files	Lines
*	Avoid define_method if possible.	José Valim	2011-04-19	3	-14/+41
*	Merge branch 'joshk-multi_json'	Joshua Peek	2011-04-19	6	-233/+42
\|\
\| *	Merge branch 'multi_json' of https://github.com/joshk/rails into joshk-multi_...	Joshua Peek	2011-04-19	6	-233/+42
\|/\|
\| *	remove MultiJson from the Gemfile and instead add the current rc to the AS ge...	Josh Kalderimis	2011-04-19	2	-2/+2
\| *	Merge branch 'master' of https://github.com/rails/rails into multi_json	Josh Kalderimis	2011-04-19	4	-7/+42
\| \|\
\| * \|	AS Json parse_error makes a return for backwards compatibility, although it w...	Josh Kalderimis	2011-04-19	2	-1/+5
\| * \|	removed AS backends and instead rely on MultiJson for json decoding	Josh Kalderimis	2011-04-18	6	-234/+39
* \| \|	Do not stream on HTTP/1.0.	José Valim	2011-04-19	2	-3/+15
* \| \|	Output a redirect to the 500 page if something happens when streaming.	José Valim	2011-04-19	3	-6/+35
* \| \|	Do not inherit from Rack::Response, remove a shit-ton of unused code.	José Valim	2011-04-19	5	-76/+61
* \| \|	Be sure to not store the closed flash in the session.	José Valim	2011-04-19	2	-17/+33
* \| \|	Merge branch 'master' of github.com:rails/rails	Jon Leighton	2011-04-18	1	-0/+26
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	adding a rake task to help generate changelog notes for release announcements	Aaron Patterson	2011-04-18	1	-0/+26
* \| \|	Bring back support for passing a callable object to the default_scope macro. ...	Jon Leighton	2011-04-18	4	-0/+52
* \| \|	Un-deprecate using 'default_scope' as a macro, but if you are calling the mac...	Jon Leighton	2011-04-18	10	-270/+85
\|/ /
* \|	Use proper coffee comments	David Heinemeier Hansson	2011-04-18	1	-3/+3
* \|	File should be open in read/write mode. When doing lock on a file.	Arun Agrawal	2011-04-18	1	-1/+1
* \|	Test explicit skip.	José Valim	2011-04-18	1	-1/+10
* \|	Just define the controller if fibers are defined.	José Valim	2011-04-18	1	-2/+2
\|/
*	Add description to assets:precompile such that it shows up in rake -T	David Heinemeier Hansson	2011-04-18	1	-1/+2
*	Add String#inquiry as a convenience method for turning a string into a String...	David Heinemeier Hansson	2011-04-18	4	-0/+21
*	Body... wanna stream my body? Body... such a thrill my body!	José Valim	2011-04-18	5	-0/+122
*	Rename it to DataStreaming.	José Valim	2011-04-18	3	-3/+3
*	Add missing dependency.	José Valim	2011-04-18	1	-0/+2
*	Slightly reorganize rendering stack.	José Valim	2011-04-18	2	-9/+28
*	Fix test_load_save in test/cases/binary_test.rb (thanks @tenderlove for actua...	Jon Leighton	2011-04-17	1	-2/+1
*	Fix test_associate_existing in has_many_through_associations_test on mysql an...	Jon Leighton	2011-04-17	1	-1/+1
*	What a lovely surprise, controller_generator_test was also failing.	José Valim	2011-04-17	1	-2/+2
*	Fix more generator tests.	José Valim	2011-04-17	1	-4/+4
*	Bring back some bits of documentation for scopes which were removed as part o...	Jon Leighton	2011-04-17	1	-1/+29
*	Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via the...	Jon Leighton	2011-04-17	6	-114/+23
*	Test failing with Jruby "uninitialized constant TestJSONEncoding::JSON"	Arun Agrawal	2011-04-17	1	-1/+1
*	Merge branch 'identity_map' of https://github.com/jasoncodes/rails into jason...	Aaron Patterson	2011-04-17	1	-2/+2
\|\
\| *	Bypass IdentityMap in PostgreSQL geometric tests.	Jason Weathered	2011-04-17	1	-2/+2
* \|	make our constructor signature match the superclass	Aaron Patterson	2011-04-17	1	-1/+1
\|/
*	Lazily load sprockets.	José Valim	2011-04-17	1	-46/+45
*	Fix assets generators.	José Valim	2011-04-17	2	-16/+11
*	Make generators more modular, add hooks and improve test suite.	José Valim	2011-04-17	11	-85/+114
*	Move app initializers to sprockets railtie.	José Valim	2011-04-17	3	-25/+33
*	Move controller configs to sprockets own railtie.	José Valim	2011-04-17	2	-1/+10
*	Generate app/* stubs directories for full plugins to show ththat it is possib...	José Valim	2011-04-17	3	-16/+33
*	Fix plugin new generator to work with new javascript/stylesheets conventions	Piotr Sarnacki	2011-04-16	3	-29/+40
*	Updating mail to 2.2.16	Mikel Lindsaar	2011-04-16	1	-1/+1
*	Fix CI test on 1.8	José Valim	2011-04-16	1	-1/+4
*	Class docs.	José Valim	2011-04-16	1	-0/+47
*	Docs.	José Valim	2011-04-16	2	-11/+10
*	content_for should work with provide.	José Valim	2011-04-16	8	-10/+43
*	Add more tests, ensure we never yield outside the fiber context and that we s...	José Valim	2011-04-16	3	-3/+18
*	Basic tests for streaming. Basic tests for provide.	José Valim	2011-04-16	4	-4/+71
*	The magic medicine worked.	José Valim	2011-04-16	2	-8/+14