Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #2799 from tomstuart/3-1-stable | Santiago Pastorino | 2011-09-05 | 1 | -0/+36 | |
| | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given | |||||
* | | | | add blanks between methods | Vijay Dev | 2011-09-05 | 1 | -0/+3 | |
| |/ / |/| | | ||||||
* | | | Remove empty test | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 | |
| | | | ||||||
* | | | Merge pull request #2863 from ↵ | Santiago Pastorino | 2011-09-04 | 1 | -0/+5 | |
|\ \ \ | | | | | | | | | | | | | | | | | raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings | |||||
| * | | | Tests shouldn't produce warnings | Ray Baxter | 2011-09-04 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | * is not allowed in windows file names. Closes #2574 #2847 | Santiago Pastorino | 2011-09-04 | 2 | -1/+1 | |
|/ / / | ||||||
* / / | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 1 | -2/+22 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end | |||||
* | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 1 | -0/+16 | |
| | | ||||||
* | | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 1 | -2/+4 | |
| | | ||||||
* | | Revert "Merge pull request #2647 from dmathieu/no_rescue" | Santiago Pastorino | 2011-08-30 | 1 | -5/+1 | |
| | | | | | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea. | |||||
* | | Removed Unused Variable. | Arun Agrawal | 2011-08-26 | 1 | -1/+1 | |
| | | ||||||
* | | 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 | |||||
* | | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 1 | -0/+3 | |
|\ \ \ \ | |/ / / |/| | | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | |||||
| * | | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | Guillermo Iguaran | 2011-08-23 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 1 | -1/+5 | |
|\ \ \ \ | |/ / / |/| | | | remove useless rescue | |||||
| * | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about. | |||||
* | | | | Add failing test case for #2654 | Andrew White | 2011-08-23 | 1 | -0/+17 | |
| | | | | ||||||
* | | | | Ensure regexp and hash key are UTF-8 | Andrew White | 2011-08-23 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | Don't modify params in place - fixes #2624 | Andrew White | 2011-08-23 | 1 | -0/+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 | |
| | | | ||||||
* | | | Properly escape glob characters. | Aaron Patterson | 2011-08-16 | 2 | -0/+15 | |
| | | | ||||||
* | | | 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. | |||||
* | | | Use lazy load hooks to set parameter wrapping configuration. This means that ↵ | Jon Leighton | 2011-08-16 | 1 | -7/+0 | |
| | | | | | | | | | | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint. | |||||
* | | | Don't refer to ActionController::Base in the wrap_parameters initializer - ↵ | Jon Leighton | 2011-08-16 | 1 | -0/+7 | |
| | | | | | | | | | | | | use config object instead. Cuts about 15% off the load time. (#734) | |||||
* | | | Unused variable removed. | Arun Agrawal | 2011-08-15 | 1 | -4/+4 | |
| | | | ||||||
* | | | Methods like status and location are interfering with redirect_to [Closes #2511] | Franck Verrot | 2011-08-14 | 1 | -0/+5 | |
| | | | ||||||
* | | | moving test_generate to an integration test with one assert per test | Aaron Patterson | 2011-08-12 | 2 | -108/+183 | |
| | | | ||||||
* | | | when calling url_for with a hash, additional (likely unwanted) values (such ↵ | Andrew Kaspick | 2011-08-11 | 1 | -0/+12 | |
| |/ |/| | | | | | as :host) would be returned in the hash... calling #dup on the hash prevents this | |||||
* | | 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 | |||||
* | | Fix the issue where default_url_options is being cached on test cases. ↵ | thoefer | 2011-08-01 | 1 | -0/+29 | |
| | | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | 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. | |||||
* | | Merge pull request #2379 from arunagw/extra_require_removal | Santiago Pastorino | 2011-07-31 | 1 | -1/+0 | |
|\ \ | | | | | | | Removing extra requires from the test. Already loaded in abstract_unit. | |||||
| * | | Removing extra requires from the test. Already loaded in abstract_unit. | Arun Agrawal | 2011-07-31 | 1 | -1/+0 | |
| |/ | ||||||
* / | remove extra require for 'active_support/dependencies' as it is required in ↵ | Vishnu Atrai | 2011-07-31 | 1 | -1/+0 | |
|/ | | | | abstract_unit.rb | |||||
* | 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 #2330 from thedarkone/resources-router-fix | José Valim | 2011-07-28 | 1 | -0/+9 | |
|\ | | | | | Inline resources router fix | |||||
| * | There is no need to be destructive with the passed-in options. | thedarkone | 2011-07-28 | 1 | -0/+9 | |
| | | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations. | |||||
* | | 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. |