| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Add app/assets/images and include the rails.png as a sample there | David Heinemeier Hansson | 2011-04-19 | 3 | -9/+1 | |
| | | | ||||||
| * | | Add note about the option to add other precompile targets | David Heinemeier Hansson | 2011-04-19 | 1 | -0/+3 | |
| | | | ||||||
| * | | Set a default precompile target to be the application.js, application.css, ↵ | David Heinemeier Hansson | 2011-04-19 | 1 | -1/+1 | |
| | | | | | | | | | and all non-css/js files (images etc) | |||||
| * | | Give assets access to asset_path during precompilation | David Heinemeier Hansson | 2011-04-19 | 1 | -0/+3 | |
| | | | ||||||
| * | | Switch to asset_path and make it available in the Sprockets::Context (now ↵ | David Heinemeier Hansson | 2011-04-19 | 5 | -40/+42 | |
| | | | | | | | | | you can do asset_path("logo.png") in a stylesheet.css.erb file and get fingerprinting) | |||||
| * | | Cleanup compute_sprockets_path -- when you are reaching for code comments, ↵ | David Heinemeier Hansson | 2011-04-19 | 1 | -21/+30 | |
| | | | | | | | | | the method could be simpler | |||||
| * | | let this regexp be stricter | Xavier Noria | 2011-04-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | The purpose of this regexp is to detect strings that are valid identifiers to be used as method names. The anchor $ allows a trailing newline, and both ^ and $ may be bypassed because Ruby regexps are multiline always. The anchors \A and \z are the proper ones to ensure string boundaries. | |||||
| * | | All assets, including images, audio, and video, now uses the asset pipeline ↵ | David Heinemeier Hansson | 2011-04-19 | 4 | -8/+44 | |
| | | | | | | | | | when its on | |||||
| * | | Let's not dup because value may not always be duplicable. | José Valim | 2011-04-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | 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 ↵ | Joshua Peek | 2011-04-19 | 6 | -233/+42 | |
| |/| | | | | | | | | | | | joshk-multi_json | |||||
| | * | | remove MultiJson from the Gemfile and instead add the current rc to the AS ↵ | Josh Kalderimis | 2011-04-19 | 2 | -2/+2 | |
| | | | | | | | | | | | | | gemspec | |||||
| | * | | 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 ↵ | Josh Kalderimis | 2011-04-19 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | will return MultiJson::DecodeError | |||||
| | * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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é 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 | |
| | | | | | | | | | | | | | | | | | You can also just use a block. | |||||
| * | | | | Un-deprecate using 'default_scope' as a macro, but if you are calling the ↵ | Jon Leighton | 2011-04-18 | 10 | -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 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 ↵ | David Heinemeier Hansson | 2011-04-18 | 4 | -0/+21 | |
| | | | | | | | | | StringInquirer object [DHH] | |||||
| * | | Body... wanna *stream* my body? Body... such a thrill my body! | José Valim | 2011-04-18 | 5 | -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é 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 ↵ | Jon Leighton | 2011-04-17 | 1 | -2/+1 | |
| | | | | | | | | | actually working out how to fix it) | |||||
| * | | Fix test_associate_existing in has_many_through_associations_test on mysql ↵ | Jon Leighton | 2011-04-17 | 1 | -1/+1 | |
| | | | | | | | | | and postgresql | |||||
| * | | 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 ↵ | Jon Leighton | 2011-04-17 | 1 | -1/+29 | |
| | | | | | | | | | of the reversion in 256b363 | |||||
| * | | Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via ↵ | Jon Leighton | 2011-04-17 | 6 | -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 Agrawal | 2011-04-17 | 1 | -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 Patterson | 2011-04-17 | 1 | -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 Weathered | 2011-04-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | The identity map cache prevents us from seeing the DB formatted strings. | |||||
| * | | | 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 ↵ | José Valim | 2011-04-17 | 3 | -16/+33 | |
| | | | | | | | | | possible to extend them. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |