aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'multi_json' of https://github.com/joshk/rails into ↵Joshua Peek2011-04-196-233/+42
|\ | | | | | | joshk-multi_json
| * remove MultiJson from the Gemfile and instead add the current rc to the AS ↵Josh Kalderimis2011-04-192-2/+2
| | | | | | | | gemspec
| * 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 ↵Josh Kalderimis2011-04-192-1/+5
| | | | | | | | | | | | will return MultiJson::DecodeError
| * | 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
| | | | | | | | | | | | | | | | | | Currently, we output: "><script type="text/javascript">window.location = "/500.html"</script></html>
* | | 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
| | | | | | | | | | | | You can also just use a block.
* | | Un-deprecate using 'default_scope' as a macro, but if you are calling the ↵Jon Leighton2011-04-1810-270/+85
|/ / | | | | | | macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.
* | 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 ↵David Heinemeier Hansson2011-04-184-0/+21
| | | | StringInquirer object [DHH]
* Body... wanna *stream* my body? Body... such a thrill my body!José Valim2011-04-185-0/+122
| | | | | Added stream as class level method to make it explicit when to stream. Render also accepts :stream as option.
* 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 ↵Jon Leighton2011-04-171-2/+1
| | | | actually working out how to fix it)
* Fix test_associate_existing in has_many_through_associations_test on mysql ↵Jon Leighton2011-04-171-1/+1
| | | | and postgresql
* 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 ↵Jon Leighton2011-04-171-1/+29
| | | | of the reversion in 256b363
* Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via ↵Jon Leighton2011-04-176-114/+23
| | | | | | | | | | the scope class method. Just define a class method yourself instead." This reverts commit f0e198bfa1e3f9689e0cde1d194a44027fc90b3c. Conflicts: activerecord/test/models/post.rb
* Test failing with Jruby "uninitialized constant TestJSONEncoding::JSON"Arun Agrawal2011-04-171-1/+1
| | | | activesupport/test/json/encoding_test.rb need Json to pass against with Jruby
* Merge branch 'identity_map' of https://github.com/jasoncodes/rails into ↵Aaron Patterson2011-04-171-2/+2
|\ | | | | | | | | | | | | jasoncodes-identity_map * 'identity_map' of https://github.com/jasoncodes/rails: Bypass IdentityMap in PostgreSQL geometric tests.
| * Bypass IdentityMap in PostgreSQL geometric tests.Jason Weathered2011-04-171-2/+2
| | | | | | | | The identity map cache prevents us from seeing the DB formatted strings.
* | 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 ↵José Valim2011-04-173-16/+33
| | | | possible to extend them.
* 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 ↵José Valim2011-04-163-3/+18
| | | | swap buffers when moving from parent to child.
* Basic tests for streaming. Basic tests for provide.José Valim2011-04-164-4/+71
|
* The magic medicine worked.José Valim2011-04-162-8/+14
|
* Yo dawg, I heard you like streaming. So I put a fiber, inside a block, ↵José Valim2011-04-1613-111/+235
| | | | inside a body, so you can stream.
* Buffer should be an option passed down to template rendering.José Valim2011-04-165-100/+5
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 23:58:00 +0000