| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2491 from waynn/fix_symbol | Santiago Pastorino | 2011-08-25 | 1 | -0/+6 |
| |\ | | | | | fix destructive stringify_keys for label_tag | ||||
| | * | fix destructive stringify_keys for label_tag | Waynn Lue | 2011-08-11 | 1 | -0/+6 |
| | | | |||||
| * | | Merge pull request #2644 from guilleiguaran/allow-assets-debugging | Santiago Pastorino | 2011-08-24 | 1 | -0/+2 |
| |\ \ | | | | | | | Add config.allow_debugging option | ||||
| | * | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | param can be passed by user | ||||
| * | | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | Guillermo Iguaran | 2011-08-23 | 1 | -0/+3 |
| |/ / | |||||
| * | | Ensure regexp and hash key are UTF-8 | Andrew White | 2011-08-23 | 1 | -1/+6 |
| | | | |||||
| * | | Merge pull request #2411 from ai/debug_assets_by_config | Santiago Pastorino | 2011-08-22 | 1 | -14/+6 |
| |\ \ | | | | | | | Debug assets by config | ||||
| | * | | Allow to debug assets by config.assets.debug | Andrey A.I. Sitnik | 2011-08-22 | 1 | -14/+6 |
| | | | | |||||
| * | | | fix escape_javascript for unicode character \u2028. | Teng Siong Ong | 2011-08-21 | 1 | -0/+1 |
| |/ / | |||||
| * | | Debug assets by default in development and test environments | Guillermo Iguaran | 2011-08-18 | 1 | -6/+22 |
| | | | |||||
| * | | Tags with invalid names should also be stripped in order to prevent | Aaron Patterson | 2011-08-16 | 1 | -0/+7 |
| | | | | | | | | | XSS attacks. Thanks Sascha Depold for the report. | ||||
| * | | Unused variable removed. | Arun Agrawal | 2011-08-15 | 1 | -4/+4 |
| | | | |||||
| * | | deprecating process_view_paths | Aaron Patterson | 2011-08-09 | 2 | -2/+2 |
| | | | |||||
| * | | generate environment dependent asset digests | Ilya Grigorik | 2011-08-04 | 1 | -0/+13 |
| | | | | | | | | | | | | | If two different environments are configured to use the pipeline, but one has an extra step (such as compression) then without taking the environment into account you may end up serving wrong assets | ||||
| * | | Merge pull request #2421 from pivotal-casebook/master | Santiago Pastorino | 2011-08-04 | 1 | -2/+2 |
| |\ \ | | | | | | | Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980) | ||||
| | * | | ActionView::Helpers::TextHelper#simple_format should not change the text in ↵ | Casebook Developer | 2011-08-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | place. Now it duplicates it. | ||||
| * | | | Merge pull request #2356 from waynn/fix_symbol | Santiago Pastorino | 2011-08-04 | 1 | -0/+24 |
| |\ \ \ | |/ / |/| / | |/ | fix stringify_keys destructive behavior for most FormTagHelper functions | ||||
| | * | fix stringify_keys destructive behavior for most FormTagHelper functions | Waynn Lue | 2011-08-03 | 1 | -0/+24 |
| | | | | | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355 | ||||
| * | | Rename new method to_path to to_partial_path to avoid conflicts with ↵ | José Valim | 2011-08-01 | 2 | -3/+3 |
| |/ | | | | File#to_path and similar. | ||||
| * | Instead of removing the instance variable just set it to nil, resolves the ↵ | Brian Cardarella | 2011-07-29 | 1 | -2/+2 |
| | | | | | warnings because of a missing instance variable | ||||
| * | Merge pull request #2034 from Casecommons/to_path | José Valim | 2011-07-28 | 2 | -0/+41 |
| |\ | | | | | Allow ActiveModel-compatible instances to define their own partial paths | ||||
| | * | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 2 | -0/+41 |
| | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | ||||
| * | | Merge pull request #2095 from dgeb/issue-2094 | Aaron Patterson | 2011-07-26 | 1 | -0/+17 |
| |\ \ | | | | | | | Fixes overriding of options[:html][:remote] in form_for() (Issue #2094) | ||||
| | * | | added test case for fix to issue #2094 | Dan Gebhardt | 2011-07-16 | 1 | -0/+17 |
| | | | | |||||
| * | | | use sprocket's append_path and assert_match | Damien Mathieu | 2011-07-26 | 1 | -26/+26 |
| | |/ |/| | |||||
| * | | no need for an anonymous class on every setup call | Aaron Patterson | 2011-07-25 | 1 | -10/+9 |
| | | | |||||
| * | | Merge pull request #2258 from thedarkone/no-file-stat | José Valim | 2011-07-25 | 1 | -2/+2 |
| |\ \ | | | | | | | Use shorter class-level File methods instead of going through File.stat | ||||
| | * | | Use shorter class-level File methods instead of going through File.stat. | thedarkone | 2011-07-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Make polymorphic_url calls go through application helpers again. | thedarkone | 2011-07-25 | 1 | -1/+1 |
| |/ / | | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs. | ||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | English to American English(according to Weber) | ||||
| * | | | just use normal ruby for stubbing | Aaron Patterson | 2011-07-23 | 1 | -5/+3 |
| | | | | |||||
| * | | | Simple fix to the NoMethodError noted in #2177. | Ben Woosley | 2011-07-23 | 1 | -1/+0 |
| |/ / | | | | | Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it. | ||||
| * | | 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 |
| |/ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |