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