Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | javascript_path and stylesheet_path should honor the asset pipelining | Santiago Pastorino | 2011-09-28 | 2 | -2/+28 |
| | |||||
* | Merge pull request #3159 from elliterate/digest_auth_with_query_string | José Valim | 2011-09-28 | 2 | -1/+10 |
|\ | | | | | Fixed digest authentication for requests with a query string [#3158] | ||||
| * | Fixed digest authentication for requests with a query string [#3158] | Colin Shield & Ian Lesperance | 2011-09-28 | 2 | -1/+10 |
| | | |||||
* | | Merge pull request #3156 from ihower/enhance_button_to_helper_v2 | Santiago Pastorino | 2011-09-28 | 2 | -5/+19 |
|\ \ | |/ |/| | Make button_to helper support "form" option | ||||
| * | Make button_to helper support "form" option which is the form attributes. | Wen-Tien Chang | 2011-09-29 | 2 | -5/+19 |
| | | |||||
* | | partial pass over the assets guide | Xavier Noria | 2011-09-28 | 1 | -15/+12 |
|/ | |||||
* | fixing typo in assets guide | Vijay Dev | 2011-09-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-test | Jon Leighton | 2011-09-28 | 2 | -2/+2 |
|\ | | | | | Fixed failed test under 1.8.7 as map.keys order in indeterminable | ||||
| * | Fixed failed test under 1.8.7 as map.keys order in indeterminable | Rocky Jaiswal | 2011-09-28 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require | Santiago Pastorino | 2011-09-27 | 1 | -0/+1 |
|\ | | | | | add missing require to html sanitizer | ||||
| * | add missing require to html sanitizer | Alexey Vakhov | 2011-09-27 | 1 | -0/+1 |
| | | |||||
* | | the infamous detail only spotted in GitHub diffs no matter how careful you ↵ | Xavier Noria | 2011-09-27 | 1 | -1/+1 |
| | | | | | | | | were before pushing | ||||
* | | partial pass over the asset pipeline | Xavier Noria | 2011-09-27 | 1 | -14/+17 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-28 | 6 | -7/+32 |
|\ | |||||
| * | copy edit d47c2c4 | Vijay Dev | 2011-09-28 | 1 | -7/+1 |
| | | |||||
| * | fixing docs for delete_sql where quotes should be used in this example. | Diego Plentz | 2011-09-26 | 1 | -1/+1 |
| | | |||||
| * | Alert about the new Bundler require for asset gems | Nicolás Hock Isaza | 2011-09-26 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | If you are coming from a Rails 3.0 application, you won't have the correct Bundler require statement. This will cause the gems under the `assets` group not to be available in the development and production environment. I think this is related to the issue #39 in rails-sass https://github.com/rails/sass-rails/issues/39 | ||||
| * | update ActionMailer example using last truncate helper method signature | Alexey Vakhov | 2011-09-26 | 1 | -2/+2 |
| | | |||||
| * | fix ActionMailer readme example | Alexey Vakhov | 2011-09-26 | 1 | -0/+2 |
| | | |||||
| * | Fixed typo that I added - doh. | Chris Kimpton | 2011-09-26 | 1 | -1/+1 |
| | | |||||
| * | Clarify that the Active Record config should just work automatically | Chris Kimpton | 2011-09-26 | 1 | -1/+5 |
| | | |||||
| * | add some notes on setup for Active Record tests | Chris Kimpton | 2011-09-26 | 1 | -0/+6 |
| | | |||||
| * | pluralize "locales" since that's what's used in other parts of the document, ↵ | Waynn Lue | 2011-09-23 | 1 | -2/+2 |
| | | | | | | | | and add a missing "on" | ||||
| * | Changed "en-UK" to "en-GB" | Christopher Arrowsmith | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Christopher Arrowsmith <chris@agouti.co.uk> | ||||
* | | Merge pull request #3141 from jsl/make_ssl_configurable | José Valim | 2011-09-27 | 4 | -3/+13 |
|\ \ | | | | | | | Make the Rack::SSL middleware configurable | ||||
| * | | Make the Rack::SSL middleware configurable | Justin Leitgeb | 2011-09-26 | 4 | -3/+13 |
|/ / | |||||
* | | partial pass over the asset pipeline guide | Xavier Noria | 2011-09-26 | 1 | -20/+22 |
| | | |||||
* | | Don't require a DB connection when setting primary key. | Jon Leighton | 2011-09-26 | 3 | -1/+20 |
| | | | | | | | | Closes #2807. | ||||
* | | Merge pull request #3138 from christos/correct_image_path_with_pipeline | Santiago Pastorino | 2011-09-26 | 2 | -2/+11 |
|\ \ | | | | | | | Correctly override image_path in sprockets rails_helper | ||||
| * | | Refactor image_path to use asset_path directly | Christos Zisopoulos | 2011-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Correctly override image_path in sprockets rails_helper | Christos Zisopoulos | 2011-09-26 | 2 | -1/+10 |
| | | | |||||
* | | | Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile | Santiago Pastorino | 2011-09-26 | 2 | -0/+22 |
| | | | | | | | | | | | | Avoid use of existing precompiled assets during rake assets:precompile run | ||||
* | | | Copy assets to nondigested filenames too | Santiago Pastorino | 2011-09-26 | 2 | -5/+11 |
|/ / | |||||
* | | Merge pull request #3030 from htanata/fix_habtm_select_query_method | Jon Leighton | 2011-09-26 | 3 | -4/+16 |
| | | | | | | | | Fix: habtm doesn't respect select query method | ||||
* | | Just assert_equal here | Santiago Pastorino | 2011-09-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3135 from christos/respect_assets_digest_value | Santiago Pastorino | 2011-09-26 | 2 | -1/+9 |
|\ \ | | | | | | | Give precedence to `config.digest = false` over the existence of manifest.yml asset digests | ||||
| * | | Give precedence to `config.digest = false` over manifest.yml asset digests | Christos Zisopoulos | 2011-09-26 | 2 | -1/+9 |
| | | | |||||
* | | | Fix belongs_to polymorphic with custom primary key on target. | Jon Leighton | 2011-09-26 | 5 | -18/+30 |
| | | | | | | | | | | | | Closes #3104. | ||||
* | | | Encapsulate assets initialization in its own rake task. | José Valim | 2011-09-26 | 1 | -3/+7 |
| | | | |||||
* | | | image_tag should use /assets if asset pipelining is turned on. Closes #3126 | Santiago Pastorino | 2011-09-26 | 2 | -0/+8 |
|/ / | |||||
* | | Make serializable_hash take attr values directly from attributes hash. | Jon Leighton | 2011-09-26 | 3 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously, it would use send() to get the attribute. In Active Resource, this would rely on hitting method missing. If a method with the same name was defined further up the ancestor chain, that method would wrongly be called. This change fixes test_to_xml_with_private_method_name_as_attribute in activeresource/test/cases/base_test.rb, which was broken after 51bef9d8fb0b4da7a104425ab8545e9331387743, because that change made to_xml use serializable_hash. | ||||
* | | CollectionProxy#replace should change the DB records rather than just ↵ | Jon Leighton | 2011-09-26 | 2 | -1/+12 |
| | | | | | | | | mutating the array. Fixes #3020. | ||||
* | | fix deprecation warning in cookie_store_test | Vijay Dev | 2011-09-25 | 1 | -1/+1 |
| | | | | | | | | The options argument to MessageVerifier#initialize should be a hash. | ||||
* | | Merge pull request #3125 from dolzenko/master | José Valim | 2011-09-25 | 2 | -0/+6 |
|\ \ | | | | | | | Implement Mime::Type#respond_to? (consistently with #method_missing) Closes #3032 | ||||
| * | | Implement Mime::Type#respond_to? (consistently with #method_missing) | Evgeniy Dolzhenko | 2011-09-25 | 2 | -0/+6 |
|/ / | |||||
* | | Merge pull request #3124 from avakhov/patch-6-stylesheet-link | José Valim | 2011-09-25 | 2 | -1/+5 |
|\ \ | | | | | | | escape options for the stylesheet_link_tag method | ||||
| * | | escape options for the stylesheet_link_tag method | Alexey Vakhov | 2011-09-25 | 2 | -1/+5 |
| | | | |||||
* | | | Merge pull request #2246 from guilleiguaran/sprockets-compressors-api | José Valim | 2011-09-25 | 4 | -31/+79 |
|\ \ \ | |/ / |/| | | Public API for add new compressors to Sprockets | ||||
| * | | Add public API for register new js and css compressors for Sprockets | Guillermo Iguaran | 2011-09-24 | 4 | -31/+79 |
|/ / | |||||
* | | Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s | Santiago Pastorino | 2011-09-24 | 1 | -1/+1 |
|\ \ | | | | | | | remove superfluous to_s in ERB::Util.html_escape |