Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | remove superfluous to_s in ERB::Util.html_escape | Alexey Vakhov | 2011-09-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3121 from cablegram/3-1-stable | Santiago Pastorino | 2011-09-24 | 1 | -1/+1 |
| | | | | | | | | Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows | ||||
* | | Revert "Make process reuse the env var passed as argument" | Santiago Pastorino | 2011-09-24 | 2 | -10/+9 |
|/ | | | | This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd. | ||||
* | Avoid using pathnames and automatically create the manifest directory if one ↵ | José Valim | 2011-09-24 | 3 | -9/+11 |
| | | | | does not exist yet. | ||||
* | Add test for belongs_to? and group initializers. | José Valim | 2011-09-24 | 1 | -2/+9 |
| | |||||
* | Remove the ENV flag, yagni. | José Valim | 2011-09-24 | 2 | -13/+0 |
| | |||||
* | `rake assets:precompile` loads the application but does not initialize it. | José Valim | 2011-09-24 | 11 | -110/+183 |
| | | | | | | | | | | | | | To the app developer, this means configuration add in config/initializers/* will not be executed. Plugins developers need to special case their initializers that are meant to be run in the assets group by adding :group => :assets. Conflicts: railties/CHANGELOG railties/test/application/assets_test.rb | ||||
* | Merge pull request #3115 from guilleiguaran/refactor-rails-helpers | Santiago Pastorino | 2011-09-23 | 1 | -5/+0 |
|\ | | | | | Remove Sprockets compute_public_path, AV compute_plubic_path can be used | ||||
| * | Remove Sprockets compute_public_path, AV compute_public_path can be used ↵ | Guillermo Iguaran | 2011-09-23 | 1 | -5/+0 |
|/ | | | | directly | ||||
* | Merge pull request #3114 from zenprogrammer/fix_constantize_doc | José Valim | 2011-09-23 | 1 | -3/+3 |
|\ | | | | | Minor doc fix to String#constantize | ||||
| * | Minor doc fix to String#constantize | Ryan Oblak | 2011-09-23 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #3092 from asee/master | Santiago Pastorino | 2011-09-23 | 2 | -1/+11 |
|\ | | | | | Sprockets to use config.assets.prefix, with tests | ||||
| * | Fixes #1489 again, with updated code and numerous tests to confirm | docunext | 2011-09-22 | 2 | -1/+11 |
| | | |||||
* | | Update CHANGELOG for safe_constantize. | José Valim | 2011-09-23 | 2 | -1/+6 |
| | | |||||
* | | Use safe_constantize where possible. | José Valim | 2011-09-23 | 3 | -12/+5 |
| | | |||||
* | | Ensure that constantize just rescues NameError that applies to the constant ↵ | José Valim | 2011-09-23 | 2 | -4/+26 |
| | | | | | | | | being currently loaded. | ||||
* | | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵ | Ryan Oblak | 2011-09-23 | 5 | -21/+106 |
| | | | | | | | | refactored common constantize tests into ConstantizeTestCases | ||||
* | | Update CHANGELOG. | José Valim | 2011-09-23 | 1 | -0/+8 |
| | | |||||
* | | Fix failing tests and add tests for :formats on partial. | José Valim | 2011-09-23 | 1 | -5/+10 |
| | | |||||
* | | Using #extract_details in PartialRenderer, too! | Nick Sutterer | 2011-09-23 | 2 | -3/+1 |
| | | |||||
* | | Allow both sym and array for details options in #render. using ↵ | Nick Sutterer | 2011-09-23 | 3 | -2/+16 |
| | | | | | | | | LC#registered_details to extract options. | ||||
* | | added tests for render :file/:template and the :formats/:handlers/:locale ↵ | Nick Sutterer | 2011-09-23 | 3 | -1/+19 |
| | | | | | | | | options. | ||||
* | | Refactor AMo as_json. | José Valim | 2011-09-23 | 1 | -9/+5 |
| | | |||||
* | | Merge pull request #3106 from mattetti/master | José Valim | 2011-09-22 | 2 | -12/+20 |
|\ \ | | | | | | | ActiveModel JSON serialization bug fix | ||||
| * | | fixed a bug with the json serialization when the class setting is set to not ↵ | Matt Aimonetti | 2011-09-22 | 2 | -12/+20 |
| | | | | | | | | | | | | include the root, but an instance is serialized with the root option passed as true | ||||
* | | | set env to let rails know we're precompiling | Terence Lee | 2011-09-22 | 2 | -0/+12 |
| | | |