| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2046 from sikachu/master-test_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+6 |
| |\ | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a | ||||
| | * | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵ | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 |
| | | | | | | | | | be in its method | ||||
| * | | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 1 | -0/+9 |
| |/ | |||||
| * | Grouped select helper | Andrew Radev | 2011-07-11 | 1 | -0/+36 |
| | | | | | FormBuilder#select now works with a nested data structure. | ||||
| * | config should always be an AS::InheritableOptions object. Closes #1992 | Santiago Pastorino | 2011-07-08 | 1 | -0/+4 |
| | | |||||
| * | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 1 | -1/+2 |
| | | | | | | | That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that. | ||||
| * | removing brittle assertion | Aaron Patterson | 2011-07-07 | 1 | -1/+0 |
| | | |||||
| * | Using the sum of bytes instead the hash of the path when replacing the ↵ | Albert Callarisa Roca | 2011-07-08 | 1 | -2/+3 |
| | | | | | wildcard of the assets path because in ruby 1.9 is not consistent | ||||
| * | Merge pull request #1925 from spohlenz/refactor-asset-paths | José Valim | 2011-07-02 | 1 | -0/+12 |
| |\ | | | | | Refactor sprockets asset paths to allow for alternate asset environments | ||||
| | * | Add tests for alternate asset prefix/environment | Sam Pohlenz | 2011-07-01 | 1 | -0/+12 |
| | | | |||||
| * | | Revert "Add method fields_for_with_index to FormHelper" | José Valim | 2011-07-01 | 1 | -125/+0 |
| | | | | | | | | | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | | Fixed ActionView::FormOptionsHelper#select with :multiple => false | Bogdan Gusiev | 2011-06-30 | 1 | -0/+7 |
| |/ | |||||
| * | Merge pull request #1870 from chriseppstein/asset_urls_master | Santiago Pastorino | 2011-06-27 | 2 | -14/+87 |
| |\ | | | | | Asset urls master | ||||
| | * | Added a configuration setting: | Chris Eppstein | 2011-06-27 | 2 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
| | * | Stylesheet link tags should use the request protocol to avoid duplicate ↵ | Chris Eppstein | 2011-06-27 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb | ||||
| | * | Add asset_url helper and refactor the asset paths so that asset hosts can be ↵ | Chris Eppstein | 2011-06-27 | 2 | -8/+54 |
| | | | | | | | | | | | | | | | | | | | | | used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
| * | | the generated ALT attribute for images no longer contains the digest, if any | Xavier Noria | 2011-06-27 | 1 | -0/+8 |
| |/ | |||||
| * | Merge pull request #1796 from jdeseno/master | Santiago Pastorino | 2011-06-22 | 1 | -0/+7 |
| |\ | | | | | link_to doesn't allow rel attribute when also specifying method | ||||
| | * | Adds a test to check link_to with method & rel options | Josh | 2011-06-21 | 1 | -0/+7 |
| | | | |||||
| * | | Merge pull request #1778 from spohlenz/hash-models | José Valim | 2011-06-22 | 1 | -0/+16 |
| |\ \ | |/ |/| | Fix nested fields_for when Hash-based model is passed. | ||||
| | * | Use real hash model in nested fields_for with hash model test | Sam Pohlenz | 2011-06-22 | 1 | -4/+2 |
| | | | |||||
| | * | Test for extractable_options? within nested fields_for. | Sam Pohlenz | 2011-06-20 | 1 | -0/+18 |
| | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options. | ||||
| * | | Do not change a frozen text passed to simple_format text helper | Tadas Tamosauskas | 2011-06-20 | 1 | -2/+9 |
| |/ | |||||
| * | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -0/+8 |
| | | |||||
| * | Define ActiveSupport#to_param as to_str - closes #1663 | Andrew White | 2011-06-12 | 1 | -0/+8 |
| | | |||||
| * | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 1 | -2/+18 |
| |\ | | | | | Fixing select[multiple] html specification problem. | ||||
| | * | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 1 | -2/+18 |
| | | | | | | | | | Generating hidden input with same name before each multiple select | ||||
| * | | There are no snowmen here | David Lee | 2011-06-11 | 2 | -4/+4 |
| | | | |||||
| * | | Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" | Santiago Pastorino and José Ignacio Costa | 2011-06-10 | 1 | -5/+0 |
| | | | | | | | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1. | ||||
| * | | Make sure that we don't perform in-place mutation on SafeBuffer string | Prem Sichanugrist | 2011-06-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633 | ||||
| * | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 1 | -0/+7 |
| | | | |||||
| * | | ensuring that json_escape returns html safe strings when passed an html safe ↵ | Aaron Patterson | 2011-06-09 | 1 | -0/+10 |
| | | | | | | | | | string | ||||
| * | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 1 | -0/+2 |
| | | | | | | | | | is already html_safe | ||||
| * | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -0/+7 |
| |/ | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | ||||
| * | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 5 | -9/+6 |
| | | |||||
| * | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 1 | -5/+5 |
| | | | | | and fixed helpers to work correctly in such case | ||||
| * | Allow multiple sources in Sprockets helpers | Guillermo Iguaran | 2011-06-05 | 1 | -0/+6 |
| | | |||||
| * | Fix typo in test. | Andrés Botero | 2011-05-28 | 1 | -1/+1 |
| | | |||||
| * | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 1 | -0/+6 |
| | | |||||
| * | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 2 | -25/+0 |
| | | |||||
| * | Move the last pockets of Sprockets stuff into the Sprockets directory | wycats | 2011-05-23 | 1 | -2/+1 |
| | | |||||
| * | Move javascript/css helpers into the Sprockets helper and just have them ↵ | wycats | 2011-05-23 | 1 | -12/+12 |
| | | | | | override the old behavior | ||||
| * | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 1 | -0/+2 |
| | | | | | extensions | ||||
| * | Eliminate uninitialized instance variable warning | wycats | 2011-05-22 | 1 | -2/+2 |
| | | |||||
| * | Prepare the context in URLHelperTest so that there are no required ↵ | wycats | 2011-05-22 | 1 | -0/+2 |
| | | | | | uninitialized instance variables | ||||
| * | We don't need to load version any more as Sprockets.beta8 is included. | Arun Agrawal | 2011-05-23 | 1 | -7/+0 |
| | | |||||
| * | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 1 | -2/+9 |
| |\ | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| | * | Add debug_asset support | Joshua Peek | 2011-05-22 | 1 | -2/+9 |
| | | | |||||
| * | | Make sure that we're able to run Action Pack test standalone. | Prem Sichanugrist | 2011-05-22 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | Sprocket was trying to look for these two things: * `Rails::VERSION::STRING` * `.initializer(str)` in `Rails::Engine` This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb` | ||||
| * | | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 1 | -0/+125 |
| |/ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |